diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-04 11:55:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-04 11:55:10 -0700 |
| commit | 816434ec4a674fcdb3c2221a6dffdc8f34020550 (patch) | |
| tree | 6b8a319171270b20bf1b2e1c98d333f47988553a /kernel | |
| parent | f357a82048ff1e5645861475b014570e11ad1911 (diff) | |
| parent | 36bd621337c91a1ecda588e5bbbae8dd9698bae7 (diff) | |
| download | kernel_goldelico_gta04-816434ec4a674fcdb3c2221a6dffdc8f34020550.zip kernel_goldelico_gta04-816434ec4a674fcdb3c2221a6dffdc8f34020550.tar.gz kernel_goldelico_gta04-816434ec4a674fcdb3c2221a6dffdc8f34020550.tar.bz2 | |
Merge branch 'x86-spinlocks-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 spinlock changes from Ingo Molnar:
"The biggest change here are paravirtualized ticket spinlocks (PV
spinlocks), which bring a nice speedup on various benchmarks.
The KVM host side will come to you via the KVM tree"
* 'x86-spinlocks-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/kvm/guest: Fix sparse warning: "symbol 'klock_waiting' was not declared as static"
kvm: Paravirtual ticketlocks support for linux guests running on KVM hypervisor
kvm guest: Add configuration support to enable debug information for KVM Guests
kvm uapi: Add KICK_CPU and PV_UNHALT definition to uapi
xen, pvticketlock: Allow interrupts to be enabled while blocking
x86, ticketlock: Add slowpath logic
jump_label: Split jumplabel ratelimit
x86, pvticketlock: When paravirtualizing ticket locks, increment by 2
x86, pvticketlock: Use callee-save for lock_spinning
xen, pvticketlocks: Add xen_nopvspin parameter to disable xen pv ticketlocks
xen, pvticketlock: Xen implementation for PV ticket locks
xen: Defer spinlock setup until boot CPU setup
x86, ticketlock: Collapse a layer of functions
x86, ticketlock: Don't inline _spin_unlock when using paravirt spinlocks
x86, spinlock: Replace pv spinlocks with pv ticketlocks
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/jump_label.c | 1 |
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 |