diff options
| author | Ian Campbell <ian.campbell@xensource.com> | 2007-01-23 09:31:32 +0000 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@xensource.com> | 2007-01-23 09:31:32 +0000 |
| commit | 789f7fef04a5414d04adc1049cac94d1330be9b4 (patch) | |
| tree | 2074c0fa5f9a9ce91b8c24045d591c718f92fbf3 /patches | |
| parent | dc59dbf3274f6bf99051b27e49a24efee4a82b81 (diff) | |
| download | xen-789f7fef04a5414d04adc1049cac94d1330be9b4.tar.gz xen-789f7fef04a5414d04adc1049cac94d1330be9b4.tar.bz2 xen-789f7fef04a5414d04adc1049cac94d1330be9b4.zip | |
[LINUX] Force .data segment to be 4k aligned on i386
by backporting git changeset c06cb8b1c4d25e5b4d7a2d7c2462619de1e0dbc4
This is required for kexec/kdump.
Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/linux-2.6.18/git-c06cb8b1c4d25e5b4d7a2d7c2462619de1e0dbc4.patch | 29 | ||||
| -rw-r--r-- | patches/linux-2.6.18/series | 1 |
2 files changed, 30 insertions, 0 deletions
diff --git a/patches/linux-2.6.18/git-c06cb8b1c4d25e5b4d7a2d7c2462619de1e0dbc4.patch b/patches/linux-2.6.18/git-c06cb8b1c4d25e5b4d7a2d7c2462619de1e0dbc4.patch new file mode 100644 index 0000000000..3634a22675 --- /dev/null +++ b/patches/linux-2.6.18/git-c06cb8b1c4d25e5b4d7a2d7c2462619de1e0dbc4.patch @@ -0,0 +1,29 @@ +commit c06cb8b1c4d25e5b4d7a2d7c2462619de1e0dbc4 +Author: Vivek Goyal <vgoyal@in.ibm.com> +Date: Wed Nov 8 17:44:41 2006 -0800 + + [PATCH] i386: Force data segment to be 4K aligned + + o Currently there is no specific alignment restriction in linker script + and in some cases it can be placed non 4K aligned addresses. This fails + kexec which checks that segment to be loaded is page aligned. + + o I guess, it does not harm data segment to be 4K aligned. + + Signed-off-by: Vivek Goyal <vgoyal@in.ibm.com> + Signed-off-by: Andi Kleen <ak@suse.de> + Signed-off-by: Andrew Morton <akpm@osdl.org> + Signed-off-by: Linus Torvalds <torvalds@osdl.org> + +diff --git a/arch/i386/kernel/vmlinux.lds.S b/arch/i386/kernel/vmlinux.lds.S +index adc1f23..c6f84a0 100644 +--- a/arch/i386/kernel/vmlinux.lds.S ++++ b/arch/i386/kernel/vmlinux.lds.S +@@ -51,6 +51,7 @@ SECTIONS + __tracedata_end = .; + + /* writeable */ ++ . = ALIGN(4096); + .data : AT(ADDR(.data) - LOAD_OFFSET) { /* Data */ + *(.data) + CONSTRUCTORS diff --git a/patches/linux-2.6.18/series b/patches/linux-2.6.18/series index 9a007ac3ab..62b3e0e0d7 100644 --- a/patches/linux-2.6.18/series +++ b/patches/linux-2.6.18/series @@ -17,3 +17,4 @@ x86_64-put-note-sections-into-a-pt_note-segment-in-vmlinux.patch git-dbaab49f92ff6ae6255762a948375e4036cbdbd2.patch x86-elfnote-as-preprocessor-macro.patch fixaddr-top.patch +git-c06cb8b1c4d25e5b4d7a2d7c2462619de1e0dbc4.patch |