diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-10-12 06:35:23 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-12 06:37:32 -0400 |
commit | 365d46dc9be9b3c833990a06f3994b1987eda578 (patch) | |
tree | 9397d1304144a288411f2118707f44ff5e862fa6 /arch/s390/include/asm/qdio.h | |
parent | 5dc64a3442b98eaa0e3730c35fcf00cf962a93e7 (diff) | |
parent | fd048088306656824958e7783ffcee27e241b361 (diff) |
Merge branch 'linus' into x86/xen
Conflicts:
arch/x86/kernel/cpu/common.c
arch/x86/kernel/process_64.c
arch/x86/xen/enlighten.c
Diffstat (limited to 'arch/s390/include/asm/qdio.h')
-rw-r--r-- | arch/s390/include/asm/qdio.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/s390/include/asm/qdio.h b/arch/s390/include/asm/qdio.h index 6813772171f2..4734c3f05354 100644 --- a/arch/s390/include/asm/qdio.h +++ b/arch/s390/include/asm/qdio.h | |||
@@ -299,7 +299,13 @@ struct qdio_ssqd_desc { | |||
299 | u8 mbccnt; | 299 | u8 mbccnt; |
300 | u16 qdioac2; | 300 | u16 qdioac2; |
301 | u64 sch_token; | 301 | u64 sch_token; |
302 | u64:64; | 302 | u8 mro; |
303 | u8 mri; | ||
304 | u8:8; | ||
305 | u8 sbalic; | ||
306 | u16:16; | ||
307 | u8:8; | ||
308 | u8 mmwc; | ||
303 | } __attribute__ ((packed)); | 309 | } __attribute__ ((packed)); |
304 | 310 | ||
305 | /* params are: ccw_device, qdio_error, queue_number, | 311 | /* params are: ccw_device, qdio_error, queue_number, |