diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-30 15:10:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-30 15:10:40 -0700 |
| commit | 84d88d5d4efc37dfb8a93a4a58d8a227ee86ffa4 (patch) | |
| tree | 8dc2761f3111a7dfee01f290f2659faaa24ec06e /arch/x86/kernel | |
| parent | e399835c349b7d8339775a004a86a492a444e230 (diff) | |
| parent | 152f9d0710a62708710161bce1b29fa8292c8c11 (diff) | |
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
sched_clock: Fix atomicity/continuity bug by using cmpxchg64()
x86: Provide an alternative() based cmpxchg64()
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/i386_ksyms_32.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/x86/kernel/i386_ksyms_32.c b/arch/x86/kernel/i386_ksyms_32.c index 43cec6bdda6..1736c5a725a 100644 --- a/arch/x86/kernel/i386_ksyms_32.c +++ b/arch/x86/kernel/i386_ksyms_32.c @@ -10,6 +10,14 @@ EXPORT_SYMBOL(mcount); #endif +/* + * Note, this is a prototype to get at the symbol for + * the export, but dont use it from C code, it is used + * by assembly code and is not using C calling convention! + */ +extern void cmpxchg8b_emu(void); +EXPORT_SYMBOL(cmpxchg8b_emu); + /* Networking helper routines. */ EXPORT_SYMBOL(csum_partial_copy_generic); |