direct-io.hg

changeset 11227:bb8d13705aac

[LINUX] Update x86/64 ELF note patch to version accepted upstream.

Signed-off-by: Ian Campbell <ian.campbell@xesource.com>
author Ian Campbell <ian.campbell@xensource.com>
date Tue Aug 22 15:55:43 2006 +0100 (2006-08-22)
parents fc5736e0a2eb
children 2b78726766d1 708b915caf78
files patches/linux-2.6.16.13/x86_64-put-note-sections-into-a-pt_note-segment-in-vmlinux.patch
line diff
     1.1 --- a/patches/linux-2.6.16.13/x86_64-put-note-sections-into-a-pt_note-segment-in-vmlinux.patch	Tue Aug 22 15:26:40 2006 +0100
     1.2 +++ b/patches/linux-2.6.16.13/x86_64-put-note-sections-into-a-pt_note-segment-in-vmlinux.patch	Tue Aug 22 15:55:43 2006 +0100
     1.3 @@ -1,19 +1,21 @@
     1.4 -diff -urN ref-linux-2.6.16.13/arch/x86_64/kernel/vmlinux.lds.S x86-64_elfnotes/arch/x86_64/kernel/vmlinux.lds.S
     1.5 ---- ref-linux-2.6.16.13/arch/x86_64/kernel/vmlinux.lds.S	2006-05-02 22:38:44.000000000 +0100
     1.6 -+++ x86-64_elfnotes/arch/x86_64/kernel/vmlinux.lds.S	2006-08-22 11:39:14.000000000 +0100
     1.7 -@@ -14,6 +14,11 @@
     1.8 +diff --git a/arch/x86_64/kernel/vmlinux.lds.S b/arch/x86_64/kernel/vmlinux.lds.S
     1.9 +index 7c4de31..ef418b3 100644
    1.10 +--- a/arch/x86_64/kernel/vmlinux.lds.S
    1.11 ++++ b/arch/x86_64/kernel/vmlinux.lds.S
    1.12 +@@ -13,6 +13,12 @@ OUTPUT_FORMAT("elf64-x86-64", "elf64-x86
    1.13   OUTPUT_ARCH(i386:x86-64)
    1.14   ENTRY(phys_startup_64)
    1.15   jiffies_64 = jiffies;
    1.16  +PHDRS {
    1.17  +	text PT_LOAD FLAGS(5);	/* R_E */
    1.18  +	data PT_LOAD FLAGS(7);	/* RWE */
    1.19 ++	user PT_LOAD FLAGS(7);	/* RWE */
    1.20  +	note PT_NOTE FLAGS(4);	/* R__ */
    1.21  +}
    1.22   SECTIONS
    1.23   {
    1.24     . = __START_KERNEL;
    1.25 -@@ -26,7 +31,7 @@
    1.26 +@@ -31,7 +37,7 @@ SECTIONS
    1.27   	KPROBES_TEXT
    1.28   	*(.fixup)
    1.29   	*(.gnu.warning)
    1.30 @@ -22,7 +24,7 @@ diff -urN ref-linux-2.6.16.13/arch/x86_6
    1.31     				/* out-of-line lock text */
    1.32     .text.lock : AT(ADDR(.text.lock) - LOAD_OFFSET) { *(.text.lock) }
    1.33   
    1.34 -@@ -43,7 +48,7 @@
    1.35 +@@ -57,7 +63,7 @@ #endif
    1.36     .data : AT(ADDR(.data) - LOAD_OFFSET) {
    1.37   	*(.data)
    1.38   	CONSTRUCTORS
    1.39 @@ -31,7 +33,25 @@ diff -urN ref-linux-2.6.16.13/arch/x86_6
    1.40   
    1.41     _edata = .;			/* End of data section */
    1.42   
    1.43 -@@ -201,4 +206,6 @@
    1.44 +@@ -89,7 +95,7 @@ #define VVIRT_OFFSET (VSYSCALL_ADDR - VS
    1.45 + #define VVIRT(x) (ADDR(x) - VVIRT_OFFSET)
    1.46 + 
    1.47 +   . = VSYSCALL_ADDR;
    1.48 +-  .vsyscall_0 :	 AT(VSYSCALL_PHYS_ADDR) { *(.vsyscall_0) }
    1.49 ++  .vsyscall_0 :	 AT(VSYSCALL_PHYS_ADDR) { *(.vsyscall_0) } :user
    1.50 +   __vsyscall_0 = VSYSCALL_VIRT_ADDR;
    1.51 + 
    1.52 +   . = ALIGN(CONFIG_X86_L1_CACHE_BYTES);
    1.53 +@@ -132,7 +138,7 @@ #undef VVIRT
    1.54 +   . = ALIGN(8192);		/* init_task */
    1.55 +   .data.init_task : AT(ADDR(.data.init_task) - LOAD_OFFSET) {
    1.56 + 	*(.data.init_task)
    1.57 +-  }
    1.58 ++  } :data
    1.59 + 
    1.60 +   . = ALIGN(4096);
    1.61 +   .data.page_aligned : AT(ADDR(.data.page_aligned) - LOAD_OFFSET) {
    1.62 +@@ -235,4 +241,6 @@ #endif
    1.63     STABS_DEBUG
    1.64   
    1.65     DWARF_DEBUG