ia64/xen-unstable

changeset 13572:4e878f596c16

[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>
author Ian Campbell <ian.campbell@xensource.com>
date Tue Jan 23 09:31:32 2007 +0000 (2007-01-23)
parents b75af612851c
children ee7c422c5f7b
files patches/linux-2.6.18/git-c06cb8b1c4d25e5b4d7a2d7c2462619de1e0dbc4.patch patches/linux-2.6.18/series
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/patches/linux-2.6.18/git-c06cb8b1c4d25e5b4d7a2d7c2462619de1e0dbc4.patch	Tue Jan 23 09:31:32 2007 +0000
     1.3 @@ -0,0 +1,29 @@
     1.4 +commit c06cb8b1c4d25e5b4d7a2d7c2462619de1e0dbc4
     1.5 +Author: Vivek Goyal <vgoyal@in.ibm.com>
     1.6 +Date:   Wed Nov 8 17:44:41 2006 -0800
     1.7 +
     1.8 +    [PATCH] i386: Force data segment to be 4K aligned
     1.9 +    
    1.10 +    o Currently there is no specific alignment restriction in linker script
    1.11 +      and in some cases it can be placed non 4K aligned addresses. This fails
    1.12 +      kexec which checks that segment to be loaded is page aligned.
    1.13 +    
    1.14 +    o I guess, it does not harm data segment to be 4K aligned.
    1.15 +    
    1.16 +    Signed-off-by: Vivek Goyal <vgoyal@in.ibm.com>
    1.17 +    Signed-off-by: Andi Kleen <ak@suse.de>
    1.18 +    Signed-off-by: Andrew Morton <akpm@osdl.org>
    1.19 +    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    1.20 +
    1.21 +diff --git a/arch/i386/kernel/vmlinux.lds.S b/arch/i386/kernel/vmlinux.lds.S
    1.22 +index adc1f23..c6f84a0 100644
    1.23 +--- a/arch/i386/kernel/vmlinux.lds.S
    1.24 ++++ b/arch/i386/kernel/vmlinux.lds.S
    1.25 +@@ -51,6 +51,7 @@ SECTIONS
    1.26 +   __tracedata_end = .;
    1.27 + 
    1.28 +   /* writeable */
    1.29 ++  . = ALIGN(4096);
    1.30 +   .data : AT(ADDR(.data) - LOAD_OFFSET) {	/* Data */
    1.31 + 	*(.data)
    1.32 + 	CONSTRUCTORS
     2.1 --- a/patches/linux-2.6.18/series	Mon Jan 22 17:31:15 2007 +0000
     2.2 +++ b/patches/linux-2.6.18/series	Tue Jan 23 09:31:32 2007 +0000
     2.3 @@ -17,3 +17,4 @@ x86_64-put-note-sections-into-a-pt_note-
     2.4  git-dbaab49f92ff6ae6255762a948375e4036cbdbd2.patch
     2.5  x86-elfnote-as-preprocessor-macro.patch
     2.6  fixaddr-top.patch
     2.7 +git-c06cb8b1c4d25e5b4d7a2d7c2462619de1e0dbc4.patch