diff options
author | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2007-02-28 09:41:02 +0000 |
---|---|---|
committer | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2007-02-28 09:41:02 +0000 |
commit | 7954a48c41bd2b5a15d3fb1a803aef884ee69fd4 (patch) | |
tree | d7eb2559fd4ef402e71bf4201637daec56a36b68 /linux-2.6-xen-sparse | |
parent | 1066e48e8618389e64d0143fc328311a87026bbd (diff) | |
download | xen-7954a48c41bd2b5a15d3fb1a803aef884ee69fd4.tar.gz xen-7954a48c41bd2b5a15d3fb1a803aef884ee69fd4.tar.bz2 xen-7954a48c41bd2b5a15d3fb1a803aef884ee69fd4.zip |
Add suspend_cancel flag to linux elf notes.
Signed-off-by: Brendan Cully <brendan@cs.ubc.ca>
Diffstat (limited to 'linux-2.6-xen-sparse')
-rw-r--r-- | linux-2.6-xen-sparse/arch/i386/kernel/head-xen.S | 1 | ||||
-rw-r--r-- | linux-2.6-xen-sparse/arch/x86_64/kernel/head-xen.S | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/linux-2.6-xen-sparse/arch/i386/kernel/head-xen.S b/linux-2.6-xen-sparse/arch/i386/kernel/head-xen.S index d788f323ae..45b6867b68 100644 --- a/linux-2.6-xen-sparse/arch/i386/kernel/head-xen.S +++ b/linux-2.6-xen-sparse/arch/i386/kernel/head-xen.S @@ -206,3 +206,4 @@ ENTRY(cpu_gdt_table) ELFNOTE(Xen, XEN_ELFNOTE_L1_MFN_VALID, .long, _PAGE_PRESENT,_PAGE_PRESENT) #endif ELFNOTE(Xen, XEN_ELFNOTE_LOADER, .asciz, "generic") + ELFNOTE(Xen, XEN_ELFNOTE_SUSPEND_CANCEL, .long, 1) diff --git a/linux-2.6-xen-sparse/arch/x86_64/kernel/head-xen.S b/linux-2.6-xen-sparse/arch/x86_64/kernel/head-xen.S index b7ef0cbcb0..3619988fa4 100644 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/head-xen.S +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/head-xen.S @@ -186,3 +186,4 @@ ENTRY(empty_zero_page) ELFNOTE(Xen, XEN_ELFNOTE_L1_MFN_VALID, .quad, _PAGE_PRESENT,_PAGE_PRESENT) ELFNOTE(Xen, XEN_ELFNOTE_FEATURES, .asciz, "writable_page_tables|writable_descriptor_tables|auto_translated_physmap|pae_pgdir_above_4gb|supervisor_mode_kernel") ELFNOTE(Xen, XEN_ELFNOTE_LOADER, .asciz, "generic") + ELFNOTE(Xen, XEN_ELFNOTE_SUSPEND_CANCEL, .long, 1) |