direct-io.hg

changeset 9317:8cc027def1de

linux-x86_64: Sync with native.

From: Jan Beulich <JBeulich@novell.com>
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
author cl349@firebug.cl.cam.ac.uk
date Sat Mar 18 16:30:20 2006 +0000 (2006-03-18)
parents e92b363402f9
children e3c7b1e97459
files linux-2.6-xen-sparse/arch/x86_64/kernel/entry-xen.S
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/entry-xen.S	Sat Mar 18 13:56:34 2006 +0000
     1.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/entry-xen.S	Sat Mar 18 16:30:20 2006 +0000
     1.3 @@ -818,7 +818,7 @@ 11:	movb $0, EVENT_MASK(%rdi)
     1.4  	jmp  error_exit
     1.5  
     1.6  #ifdef CONFIG_X86_LOCAL_APIC
     1.7 -ENTRY(nmi)
     1.8 +KPROBE_ENTRY(nmi)
     1.9  	zeroentry do_nmi_callback
    1.10  ENTRY(do_nmi_callback)
    1.11          addq $8, %rsp
    1.12 @@ -828,6 +828,7 @@ ENTRY(do_nmi_callback)
    1.13          XEN_BLOCK_EVENTS(%rsi)
    1.14          GET_THREAD_INFO(%rcx)
    1.15          jmp  retint_restore_args
    1.16 +	.previous .text
    1.17  #endif
    1.18  
    1.19          ALIGN