diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-06 20:20:46 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-06 20:20:46 -0800 |
| commit | b32fc0a0629bf5894b35f33554c118aacfd0d1e2 (patch) | |
| tree | 5d6aaa9a35b7fa63681adab91da3b3dec5276f84 /arch/arm/mach-pxa/viper.c | |
| parent | 403299a8515c56db58454c57712f4dc96d6c1fde (diff) | |
| parent | 97ce2c88f9ad42e3c60a9beb9fca87abf3639faa (diff) | |
Merge branch 'upstream/jump-label-noearly' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen
* 'upstream/jump-label-noearly' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen:
jump-label: initialize jump-label subsystem much earlier
x86/jump_label: add arch_jump_label_transform_static()
s390/jump-label: add arch_jump_label_transform_static()
jump_label: add arch_jump_label_transform_static() to optimise non-live code updates
sparc/jump_label: drop arch_jump_label_text_poke_early()
x86/jump_label: drop arch_jump_label_text_poke_early()
jump_label: if a key has already been initialized, don't nop it out
stop_machine: make stop_machine safe and efficient to call early
jump_label: use proper atomic_t initializer
Conflicts:
- arch/x86/kernel/jump_label.c
Added __init_or_module to arch_jump_label_text_poke_early vs
removal of that function entirely
- kernel/stop_machine.c
same patch ("stop_machine: make stop_machine safe and efficient
to call early") merged twice, with whitespace fix in one version
Diffstat (limited to 'arch/arm/mach-pxa/viper.c')
0 files changed, 0 insertions, 0 deletions