From: Stefan Weinhuber <wein@de.ibm.com>
Date: Thu, 29 Jun 2006 13:02:59 +0000 (+0200)
Subject: [S390] dasd eer data format.
X-Git-Tag: v2.6.18-rc1~360^2~10
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=774fc4ef718f7343306ba3695e8a2622cbd9764d;p=linux-2.6-omap-h63xx.git

[S390] dasd eer data format.

The struct dasd_eer_header needs the packed attribute, or there will
be 6 additional bytes of random data between the fixed header and
the variable length part of the eer data.

Signed-off-by: Stefan Weinhuber <wein@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
---

diff --git a/drivers/s390/block/dasd_eer.c b/drivers/s390/block/dasd_eer.c
index 9d574ede1b1..da65f1b032f 100644
--- a/drivers/s390/block/dasd_eer.c
+++ b/drivers/s390/block/dasd_eer.c
@@ -276,7 +276,7 @@ struct dasd_eer_header {
 	__u64 tv_sec;
 	__u64 tv_usec;
 	char busid[DASD_EER_BUSID_SIZE];
-};
+} __attribute__ ((packed));
 
 /*
  * The following function can be used for those triggers that have