From 544662842076bc5477ad10880ce3dd20a326b1dd Mon Sep 17 00:00:00 2001 From: Peter Oberparleiter Date: Sun, 4 Jun 2006 02:51:28 -0700 Subject: [PATCH] --- yaml --- r: 27099 b: refs/heads/master c: 4ae9538dd02824257e8e72c053c69ad6680aba04 h: refs/heads/master i: 27097: b53e936a913c42d4acd2280a72cc1ba3dac50e4d 27095: d272715a85bc29fb1cad749a8269587b3e29e3f2 v: v3 --- [refs] | 2 +- trunk/drivers/s390/cio/css.h | 4 ++-- trunk/include/asm-s390/lowcore.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 282f3561cf85..42fdb524ef87 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e0ec574987a3301f7767750bb6e8be47d6323bfa +refs/heads/master: 4ae9538dd02824257e8e72c053c69ad6680aba04 diff --git a/trunk/drivers/s390/cio/css.h b/trunk/drivers/s390/cio/css.h index 74a257b23383..e210f89a2449 100644 --- a/trunk/drivers/s390/cio/css.h +++ b/trunk/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 */ diff --git a/trunk/include/asm-s390/lowcore.h b/trunk/include/asm-s390/lowcore.h index db0606c1abd4..bea727904287 100644 --- a/trunk/include/asm-s390/lowcore.h +++ b/trunk/include/asm-s390/lowcore.h @@ -98,8 +98,8 @@ #define __LC_KERNEL_ASCE 0xD58 #define __LC_USER_ASCE 0xD60 #define __LC_PANIC_STACK 0xD68 -#define __LC_CPUID 0xD90 -#define __LC_CPUADDR 0xD98 +#define __LC_CPUID 0xD80 +#define __LC_CPUADDR 0xD88 #define __LC_IPLDEV 0xDB8 #define __LC_JIFFY_TIMER 0xDC0 #define __LC_CURRENT 0xDD8