Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
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
+2
-2
arch/s390/include/asm/lowcore.h
+2
-2
arch/s390/include/asm/lowcore.h
···
293
293
__u64 clock_comparator; /* 0x02d0 */
294
294
__u32 machine_flags; /* 0x02d8 */
295
295
__u32 ftrace_func; /* 0x02dc */
296
-
__u8 pad_0x02f0[0x0300-0x02f0]; /* 0x02f0 */
296
+
__u8 pad_0x02e0[0x0300-0x02e0]; /* 0x02e0 */
297
297
298
298
/* Interrupt response block */
299
299
__u8 irb[64]; /* 0x0300 */
300
300
301
-
__u8 pad_0x0400[0x0e00-0x0400]; /* 0x0400 */
301
+
__u8 pad_0x0340[0x0e00-0x0340]; /* 0x0340 */
302
302
303
303
/*
304
304
* 0xe00 contains the address of the IPL Parameter Information
+3
-1
drivers/s390/cio/qdio_main.c
+3
-1
drivers/s390/cio/qdio_main.c
···
531
531
qdio_siga_sync_q(q);
532
532
get_buf_state(q, q->first_to_check, &state, 0);
533
533
534
-
if (state == SLSB_P_INPUT_PRIMED)
534
+
if (state == SLSB_P_INPUT_PRIMED || state == SLSB_P_INPUT_ERROR)
535
535
/* more work coming */
536
536
return 0;
537
537
···
959
959
if (cstat || dstat)
960
960
qdio_handle_activate_check(cdev, intparm, cstat,
961
961
dstat);
962
+
break;
963
+
case QDIO_IRQ_STATE_STOPPED:
962
964
break;
963
965
default:
964
966
WARN_ON(1);