Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 909ccdb4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 2cbd1883 7717aeff

arch/s390/include/asm/lowcore.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -293,12 +293,12 @@ struct _lowcore 
	__u64	clock_comparator;		/* 0x02d0 */

	__u64	clock_comparator;		/* 0x02d0 */

	__u32	machine_flags;			/* 0x02d8 */

	__u32	machine_flags;			/* 0x02d8 */

	__u32	ftrace_func;			/* 0x02dc */

	__u32	ftrace_func;			/* 0x02dc */

	__u8	pad_0x02f0[0x0300-0x02f0];	/* 0x02f0 */

	__u8	pad_0x02e0[0x0300-0x02e0];	/* 0x02e0 */





	/* Interrupt response block */

	/* Interrupt response block */

	__u8	irb[64];			/* 0x0300 */

	__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

	 * 0xe00 contains the address of the IPL Parameter Information

drivers/s390/cio/qdio_main.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -531,7 +531,7 @@ static inline int qdio_inbound_q_done(struct qdio_q *q) 
	qdio_siga_sync_q(q);

	qdio_siga_sync_q(q);

	get_buf_state(q, q->first_to_check, &state, 0);

	get_buf_state(q, q->first_to_check, &state, 0);





	if (state == SLSB_P_INPUT_PRIMED)

	if (state == SLSB_P_INPUT_PRIMED || state == SLSB_P_INPUT_ERROR)

		/* more work coming */

		/* more work coming */

		return 0;

		return 0;
@@ -960,6 +960,8 @@ void qdio_int_handler(struct ccw_device *cdev, unsigned long intparm, 
			qdio_handle_activate_check(cdev, intparm, cstat,

			qdio_handle_activate_check(cdev, intparm, cstat,

						   dstat);

						   dstat);

		break;

		break;

	case QDIO_IRQ_STATE_STOPPED:

		break;

	default:

	default:

		WARN_ON(1);

		WARN_ON(1);

	}

	}