diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-15 18:59:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-15 18:59:56 -0700 |
| commit | da849abeb86ddaa093b0935fde595e8e4dd21ffc (patch) | |
| tree | f985f6b1858f3abce274f267bfde051810215ed0 /arch/x86/kernel/entry_64.S | |
| parent | 21a32816b2e13eafb6d8a4589a84c6e629adc392 (diff) | |
| parent | 371c394af27ab7d1e58a66bc19d9f1f3ac1f67b4 (diff) | |
| download | kernel_samsung_smdk4412-da849abeb86ddaa093b0935fde595e8e4dd21ffc.zip kernel_samsung_smdk4412-da849abeb86ddaa093b0935fde595e8e4dd21ffc.tar.gz kernel_samsung_smdk4412-da849abeb86ddaa093b0935fde595e8e4dd21ffc.tar.bz2 | |
Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, binutils, xen: Fix another wrong size directive
x86: Remove dead config option X86_CPU
x86: Really print supported CPUs if PROCESSOR_SELECT=y
x86: Fix a bogus unwind annotation in lib/semaphore_32.S
um, x86-64: Fix UML build after adding CFI annotations to lib/rwsem_64.S
x86: Remove unused bits from lib/thunk_*.S
x86: Use {push,pop}_cfi in more places
x86-64: Add CFI annotations to lib/rwsem_64.S
x86, asm: Cleanup unnecssary macros in asm-offsets.c
x86, system.h: Drop unused __SAVE/__RESTORE macros
x86: Use bitmap library functions
x86: Partly unify asm-offsets_{32,64}.c
x86: Reduce back the alignment of the per-CPU data section
Diffstat (limited to 'arch/x86/kernel/entry_64.S')
| -rw-r--r-- | arch/x86/kernel/entry_64.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index 0a0ed79..c32cbbc 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S @@ -1250,7 +1250,7 @@ ENTRY(xen_do_hypervisor_callback) # do_hypervisor_callback(struct *pt_regs) decl PER_CPU_VAR(irq_count) jmp error_exit CFI_ENDPROC -END(do_hypervisor_callback) +END(xen_do_hypervisor_callback) /* * Hypervisor uses this for application faults while it executes. |