summaryrefslogtreecommitdiffstats
path: root/kernel/jump_label.c
diff options
context:
space:
mode:
authorAndrew Jones <drjones@redhat.com>2013-08-09 19:51:57 +0530
committerH. Peter Anvin <hpa@linux.intel.com>2013-08-09 07:53:54 -0700
commit851cf6e7d6366195d4ee033cdc7787df1a649a14 (patch)
tree24e863ab40ae34501f54c1584f98563f25c611d0 /kernel/jump_label.c
parent4a1ed4ca681e7df38ed1b609a11aab38cbc515b3 (diff)
downloadop-kernel-dev-851cf6e7d6366195d4ee033cdc7787df1a649a14.zip
op-kernel-dev-851cf6e7d6366195d4ee033cdc7787df1a649a14.tar.gz
jump_label: Split jumplabel ratelimit
Commit b202952075f62603bea9bfb6ebc6b0420db11949 ("perf, core: Rate limit perf_sched_events jump_label patching") introduced rate limiting for jump label disabling. The changes were made in the jump label code in order to be more widely available and to keep things tidier. This is all fine, except now jump_label.h includes linux/workqueue.h, which makes it impossible to include jump_label.h from anything that workqueue.h needs. For example, it's now impossible to include jump_label.h from asm/spinlock.h, which is done in proposed pv-ticketlock patches. This patch splits out the rate limiting related changes from jump_label.h into a new file, jump_label_ratelimit.h, to resolve the issue. Signed-off-by: Andrew Jones <drjones@redhat.com> Link: http://lkml.kernel.org/r/1376058122-8248-10-git-send-email-raghavendra.kt@linux.vnet.ibm.com Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Signed-off-by: Raghavendra K T <raghavendra.kt@linux.vnet.ibm.com> Acked-by: Ingo Molnar <mingo@kernel.org> Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'kernel/jump_label.c')
-rw-r--r--kernel/jump_label.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/jump_label.c b/kernel/jump_label.c
index 60f48fa..297a924 100644
--- a/kernel/jump_label.c
+++ b/kernel/jump_label.c
@@ -13,6 +13,7 @@
#include <linux/sort.h>
#include <linux/err.h>
#include <linux/static_key.h>
+#include <linux/jump_label_ratelimit.h>
#ifdef HAVE_JUMP_LABEL
OpenPOWER on IntegriCloud