Merge "perf: pass correct parameter when removing event" (4ce22c9a) · Commits · e / devices / android_kernel_xiaomi_markw

kernel/events/core.c

+6 −4

Original line number	Diff line number	Diff line
		@@ -1541,7 +1541,8 @@ static int __perf_remove_from_context(void *info)


		#ifdef CONFIG_SMP
		static void perf_retry_remove(struct perf_event *event)
		static void perf_retry_remove(struct perf_event *event,
		struct remove_event *rep)
		{
		int up_ret;
		/*
		@@ -1552,13 +1553,14 @@ static void perf_retry_remove(struct perf_event *event)
		if (!up_ret)
		/* Try the remove call once again. */
		cpu_function_call(event->cpu, __perf_remove_from_context,
		event);
		rep);
		else
		pr_err("Failed to bring up CPU: %d, ret: %d\n",
		event->cpu, up_ret);
		}
		#else
		static void perf_retry_remove(struct perf_event *event)
		static void perf_retry_remove(struct perf_event *event,
		struct remove_event *rep)
		{
		}
		#endif
		@@ -1599,7 +1601,7 @@ static void __ref perf_remove_from_context(struct perf_event *event,
		ret = cpu_function_call(event->cpu, __perf_remove_from_context,
		&re);
		if (ret == -ENXIO)
		perf_retry_remove(event);
		perf_retry_remove(event, &re);

		return;
		}