summaryrefslogtreecommitdiffstats
path: root/drivers/s390
diff options
context:
space:
mode:
authorPeter Oberparleiter2006-06-04 11:51:28 +0200
committerLinus Torvalds2006-06-05 21:29:16 +0200
commit4ae9538dd02824257e8e72c053c69ad6680aba04 (patch)
treea3383d1ae08a78a4d5d6247cd480923dc8812429 /drivers/s390
parent[PATCH] s390: irb memcpy argument swap (diff)
downloadkernel-qcow2-linux-4ae9538dd02824257e8e72c053c69ad6680aba04.tar.gz
kernel-qcow2-linux-4ae9538dd02824257e8e72c053c69ad6680aba04.tar.xz
kernel-qcow2-linux-4ae9538dd02824257e8e72c053c69ad6680aba04.zip
[PATCH] s390: cio non-unique path group ids
From: Peter Oberparleiter <peter.oberparleiter@de.ibm.com> The path grouping can fail due to non-unique pathgroup-IDs. The source for the CPU-ID part of the ID was incorrectly specified on 64 bit systems. Additionally, the length of the ID was too large due to incorrect data packing declaration. Fix CPU-ID lowcore address and add missing packing declaration. Signed-off-by: Peter Oberparleiter <peter.oberparleiter@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/s390')
-rw-r--r--drivers/s390/cio/css.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/s390/cio/css.h b/drivers/s390/cio/css.h
index 74a257b23383..e210f89a2449 100644
--- a/drivers/s390/cio/css.h
+++ b/drivers/s390/cio/css.h
@@ -45,11 +45,11 @@ struct pgid {
union {
__u8 fc; /* SPID function code */
struct path_state ps; /* SNID path state */
- } inf;
+ } __attribute__ ((packed)) inf;
union {
__u32 cpu_addr : 16; /* CPU address */
struct extended_cssid ext_cssid;
- } pgid_high;
+ } __attribute__ ((packed)) pgid_high;
__u32 cpu_id : 24; /* CPU identification */
__u32 cpu_model : 16; /* CPU model */
__u32 tod_high; /* high word TOD clock */