diff --git a/[refs] b/[refs] index a7c9524ca5a1..9c9d65480a78 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 58d7e993b16b62d30f8ef27757614056fe4def11 +refs/heads/master: 548e1ddf255b4ebfb4ef20c08936fd8d4deb3bd9 diff --git a/trunk/kernel/perf_counter.c b/trunk/kernel/perf_counter.c index e814ff04d7ca..0173738dd548 100644 --- a/trunk/kernel/perf_counter.c +++ b/trunk/kernel/perf_counter.c @@ -90,14 +90,12 @@ void perf_disable(void) __perf_disable(); hw_perf_disable(); } -EXPORT_SYMBOL_GPL(perf_disable); /* ACPI idle */ void perf_enable(void) { if (__perf_enable()) hw_perf_enable(); } -EXPORT_SYMBOL_GPL(perf_enable); /* ACPI idle */ static void list_add_counter(struct perf_counter *counter, struct perf_counter_context *ctx)