[PATCH 1/2] Make dtstruct variable to be 8 byte aligned

[PATCH 1/2] Make dtstruct variable to be 8 byte aligned

[M. Mohan Kumar]

[PATCH 1/2] Make dtstruct variable to be 8 byte aligned

kexec is creating a version 3 device tree to be backwards compatible. This
version of the struct has 8-byte alignment for properties whose value is 8 or
more bytes. As the code directly checks the pointer when deciding to add the
alignment word, the struct memory must start on an 8 byte boundary. Force the
dtstruct variable to be always 8 bytes aligned.

Signed-off-by: M. Mohan Kumar <mohan@in.ibm.com>
---
 kexec/arch/ppc64/fs2dt.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/kexec/arch/ppc64/fs2dt.c b/kexec/arch/ppc64/fs2dt.c
index 1f551fd..b01ff86 100644
--- a/kexec/arch/ppc64/fs2dt.c
+++ b/kexec/arch/ppc64/fs2dt.c
@@ -41,7 +41,7 @@
 
 static char pathname[MAXPATH], *pathstart;
 static char propnames[NAMESPACE] = { 0 };
-static unsigned dtstruct[TREEWORDS], *dt;
+static unsigned dtstruct[TREEWORDS] __attribute__ ((aligned (8))), *dt;
 static unsigned long long mem_rsrv[2*MEMRESERVE] = { 0, 0 };
 
 static int crash_param = 0;
-- 
1.6.2.5

Re: [PATCH 1/2] Make dtstruct variable to be 8 byte aligned

[Simon Horman]

On Mon, Aug 10, 2009 at 07:43:51PM +0530, M. Mohan Kumar wrote:
> [PATCH 1/2] Make dtstruct variable to be 8 byte aligned
> 
> kexec is creating a version 3 device tree to be backwards compatible. This
> version of the struct has 8-byte alignment for properties whose value is 8 or
> more bytes. As the code directly checks the pointer when deciding to add the
> alignment word, the struct memory must start on an 8 byte boundary. Force the
> dtstruct variable to be always 8 bytes aligned.
> 
> Signed-off-by: M. Mohan Kumar <mohan@in.ibm.com>

Thanks, applied.