summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoern Engel <joern@wohnheim.fh-wedel.de>2005-06-07 16:04:29 +0100
committerThomas Gleixner <tglx@mtd.linutronix.de>2005-06-29 14:20:23 +0200
commitbe76c5fb406fad93ab93ba39e7858e03d58c5d30 (patch)
tree09e7814dcca9c1a822c84c5225c7fdf762ae6ee0
parent02b15e343aeefb49f8cac949be599d78250a568f (diff)
[MTD] Fix commandline parser alignement
Add alignment to cmdline. From: "Timofei V. Bondarenko" <tim@ipi.ac.ru> Signed-off-by: Joern Engel <joern@wohnheim.fh-wedel.de> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--drivers/mtd/cmdlinepart.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/mtd/cmdlinepart.c b/drivers/mtd/cmdlinepart.c
index 60ab4b89a2f9..ef24837019d3 100644
--- a/drivers/mtd/cmdlinepart.c
+++ b/drivers/mtd/cmdlinepart.c
@@ -1,5 +1,5 @@
/*
- * $Id: cmdlinepart.c,v 1.17 2004/11/26 11:18:47 lavinen Exp $
+ * $Id: cmdlinepart.c,v 1.18 2005/06/07 15:04:26 joern Exp $
*
* Read flash partition table from command line
*
@@ -239,7 +239,8 @@ static int mtdpart_setup_real(char *s)
&num_parts, /* out: number of parts */
0, /* first partition */
(unsigned char**)&this_mtd, /* out: extra mem */
- mtd_id_len + 1 + sizeof(*this_mtd));
+ mtd_id_len + 1 + sizeof(*this_mtd) +
+ sizeof(void*)-1 /*alignment*/);
if(!parts)
{
/*
@@ -252,6 +253,9 @@ static int mtdpart_setup_real(char *s)
return 0;
}
+ /* align this_mtd */
+ this_mtd = (struct cmdline_mtd_partition *)
+ ALIGN((unsigned long)this_mtd, sizeof(void*));
/* enter results */
this_mtd->parts = parts;
this_mtd->num_parts = num_parts;