diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-25 05:24:12 +1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-25 05:24:12 +1000 |
| commit | 4398f31ca7989cbddca96267e3d018d440bac30e (patch) | |
| tree | 77b59bd0b224107970f18c63299e58ffc63ff532 /arch/x86/include/asm/jump_label.h | |
| parent | d315777b32a4696feb86f2a0c9e9f39c94683649 (diff) | |
| parent | 8969691343354bdd80eff5405a0f879edbf013d6 (diff) | |
| download | blackbird-obmc-linux-4398f31ca7989cbddca96267e3d018d440bac30e.tar.gz blackbird-obmc-linux-4398f31ca7989cbddca96267e3d018d440bac30e.zip | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: Fix jump label with RO/NX module protection crash
x86, hotplug: Fix powersavings with offlined cores on AMD
x86, mcheck, therm_throt.c: Export symbol platform_thermal_notify to allow coretemp to handler intr
x86: Use asm-generic/cacheflush.h
x86: Update CPU cache attributes table descriptors
Diffstat (limited to 'arch/x86/include/asm/jump_label.h')
| -rw-r--r-- | arch/x86/include/asm/jump_label.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/jump_label.h b/arch/x86/include/asm/jump_label.h index f52d42e80585..574dbc22893a 100644 --- a/arch/x86/include/asm/jump_label.h +++ b/arch/x86/include/asm/jump_label.h @@ -14,7 +14,7 @@ do { \ asm goto("1:" \ JUMP_LABEL_INITIAL_NOP \ - ".pushsection __jump_table, \"a\" \n\t"\ + ".pushsection __jump_table, \"aw\" \n\t"\ _ASM_PTR "1b, %l[" #label "], %c0 \n\t" \ ".popsection \n\t" \ : : "i" (key) : : label); \ |
