mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 10:11:27 +01:00
Signed-off-by: Christian Limpach <Christian.Limpach@xensource.com> --HG-- rename : linux-2.6-xen-sparse/include/asm-i386/mach-xen/setup_arch_pre.h => linux-2.6-xen-sparse/include/asm-i386/mach-xen/setup_arch.h rename : patches/linux-2.6.17/blktap-aio-16_03_06.patch => patches/linux-2.6.18/blktap-aio-16_03_06.patch rename : patches/linux-2.6.17/fix-ide-cd-pio-mode.patch => patches/linux-2.6.18/fix-ide-cd-pio-mode.patch rename : patches/linux-2.6.17/git-3566561bfadffcb5dbc85d576be80c0dbf2cccc9.patch => patches/linux-2.6.18/git-3566561bfadffcb5dbc85d576be80c0dbf2cccc9.patch rename : patches/linux-2.6.17/git-4bfaaef01a1badb9e8ffb0c0a37cd2379008d21f.patch => patches/linux-2.6.18/git-4bfaaef01a1badb9e8ffb0c0a37cd2379008d21f.patch rename : patches/linux-2.6.17/git-dbaab49f92ff6ae6255762a948375e4036cbdbd2.patch => patches/linux-2.6.18/git-dbaab49f92ff6ae6255762a948375e4036cbdbd2.patch rename : patches/linux-2.6.17/i386-mach-io-check-nmi.patch => patches/linux-2.6.18/i386-mach-io-check-nmi.patch rename : patches/linux-2.6.17/ipv6-no-autoconf.patch => patches/linux-2.6.18/ipv6-no-autoconf.patch rename : patches/linux-2.6.17/linux-2.6.19-rc1-kexec-move_segment_code-i386.patch => patches/linux-2.6.18/linux-2.6.19-rc1-kexec-move_segment_code-i386.patch rename : patches/linux-2.6.17/linux-2.6.19-rc1-kexec-move_segment_code-x86_64.patch => patches/linux-2.6.18/linux-2.6.19-rc1-kexec-move_segment_code-x86_64.patch rename : patches/linux-2.6.17/net-csum.patch => patches/linux-2.6.18/net-csum.patch rename : patches/linux-2.6.17/net-gso-5-rcv-mss.patch => patches/linux-2.6.18/net-gso-5-rcv-mss.patch rename : patches/linux-2.6.17/net-gso-6-linear-segmentation.patch => patches/linux-2.6.18/net-gso-6-linear-segmentation.patch rename : patches/linux-2.6.17/pmd-shared.patch => patches/linux-2.6.18/pmd-shared.patch rename : patches/linux-2.6.17/rename-TSS_sysenter_esp0-SYSENTER_stack_esp0.patch => patches/linux-2.6.18/rename-TSS_sysenter_esp0-SYSENTER_stack_esp0.patch rename : patches/linux-2.6.17/series => patches/linux-2.6.18/series rename : patches/linux-2.6.17/x86-elfnote-as-preprocessor-macro.patch => patches/linux-2.6.18/x86-elfnote-as-preprocessor-macro.patch rename : patches/linux-2.6.17/x86-put-note-sections-into-a-pt_note-segment-in-vmlinux.patch => patches/linux-2.6.18/x86-put-note-sections-into-a-pt_note-segment-in-vmlinux.patch rename : patches/linux-2.6.17/x86_64-put-note-sections-into-a-pt_note-segment-in-vmlinux.patch => patches/linux-2.6.18/x86_64-put-note-sections-into-a-pt_note-segment-in-vmlinux.patch rename : patches/linux-2.6.17/xen-hotplug.patch => patches/linux-2.6.18/xen-hotplug.patch rename : patches/linux-2.6.17/xenoprof-generic.patch => patches/linux-2.6.18/xenoprof-generic.patch
44 lines
1.4 KiB
Diff
44 lines
1.4 KiB
Diff
diff -pruN ../orig-linux-2.6.18/include/linux/elfnote.h ./include/linux/elfnote.h
|
|
--- ../orig-linux-2.6.18/include/linux/elfnote.h 2007-01-12 18:19:44.000000000 +0000
|
|
+++ ./include/linux/elfnote.h 2007-01-12 18:21:02.000000000 +0000
|
|
@@ -31,22 +31,24 @@
|
|
/*
|
|
* Generate a structure with the same shape as Elf{32,64}_Nhdr (which
|
|
* turn out to be the same size and shape), followed by the name and
|
|
- * desc data with appropriate padding. The 'desc' argument includes
|
|
- * the assembler pseudo op defining the type of the data: .asciz
|
|
- * "hello, world"
|
|
+ * desc data with appropriate padding. The 'desctype' argument is the
|
|
+ * assembler pseudo op defining the type of the data e.g. .asciz while
|
|
+ * 'descdata' is the data itself e.g. "hello, world".
|
|
+ *
|
|
+ * e.g. ELFNOTE(XYZCo, 42, .asciz, "forty-two")
|
|
+ * ELFNOTE(XYZCo, 12, .long, 0xdeadbeef)
|
|
*/
|
|
-.macro ELFNOTE name type desc:vararg
|
|
-.pushsection ".note.\name"
|
|
- .align 4
|
|
- .long 2f - 1f /* namesz */
|
|
- .long 4f - 3f /* descsz */
|
|
- .long \type
|
|
-1:.asciz "\name"
|
|
-2:.align 4
|
|
-3:\desc
|
|
-4:.align 4
|
|
-.popsection
|
|
-.endm
|
|
+#define ELFNOTE(name, type, desctype, descdata) \
|
|
+.pushsection .note.name ; \
|
|
+ .align 4 ; \
|
|
+ .long 2f - 1f /* namesz */ ; \
|
|
+ .long 4f - 3f /* descsz */ ; \
|
|
+ .long type ; \
|
|
+1:.asciz "name" ; \
|
|
+2:.align 4 ; \
|
|
+3:desctype descdata ; \
|
|
+4:.align 4 ; \
|
|
+.popsection ;
|
|
#else /* !__ASSEMBLER__ */
|
|
#include <linux/elf.h>
|
|
/*
|