summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-02-10 07:19:07 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-02-10 07:19:07 -0800
commit909ccdb4cf9b2c3bfb803392e93c6195d2e68799 (patch)
treed06764ca1a5cb2354b8137dbdb5541ea4efdc669 /arch
parent2cbd1883881ac490d93514324b947a0267c5ca96 (diff)
parent7717aefff3290c61e5f9e6aa39e9e1dc63cd4e81 (diff)
downloadkernel-crypto-909ccdb4cf9b2c3bfb803392e93c6195d2e68799.tar.gz
kernel-crypto-909ccdb4cf9b2c3bfb803392e93c6195d2e68799.tar.xz
kernel-crypto-909ccdb4cf9b2c3bfb803392e93c6195d2e68799.zip
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: [S390] Fix struct _lowcore layout. [S390] qdio: prevent call trace if CHPID is offline [S390] qdio: continue polling for buffer state ERROR
Diffstat (limited to 'arch')
-rw-r--r--arch/s390/include/asm/lowcore.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/include/asm/lowcore.h b/arch/s390/include/asm/lowcore.h
index f2ef4b619ce..c25dfac7dd7 100644
--- a/arch/s390/include/asm/lowcore.h
+++ b/arch/s390/include/asm/lowcore.h
@@ -293,12 +293,12 @@ struct _lowcore
__u64 clock_comparator; /* 0x02d0 */
__u32 machine_flags; /* 0x02d8 */
__u32 ftrace_func; /* 0x02dc */
- __u8 pad_0x02f0[0x0300-0x02f0]; /* 0x02f0 */
+ __u8 pad_0x02e0[0x0300-0x02e0]; /* 0x02e0 */
/* Interrupt response block */
__u8 irb[64]; /* 0x0300 */
- __u8 pad_0x0400[0x0e00-0x0400]; /* 0x0400 */
+ __u8 pad_0x0340[0x0e00-0x0340]; /* 0x0340 */
/*
* 0xe00 contains the address of the IPL Parameter Information