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

Commit 981a2edd 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 single stepped svcs with TRACE_IRQFLAGS=y
  [S390] zcrypt: Do not remove coprocessor for error 8/72
  [S390] sclp_vt220: set initial terminal window size
  [S390] use set_current_state in sigsuspend
  [S390] irqflags: add missing types.h include
  [S390] dasd: fix possible NULL pointer errors
parents 4bdadb97 21ec7f6d

arch/s390/include/asm/irqflags.h

+3 −6
Original line number Diff line number Diff line 
/*

 *  include/asm-s390/irqflags.h

 *

 *    Copyright (C) IBM Corp. 2006

 *    Author(s): Heiko Carstens <heiko.carstens@de.ibm.com>

 *    Copyright IBM Corp. 2006,2010

 *    Author(s): Martin Schwidefsky <schwidefsky@de.ibm.com>

 */



#ifndef __ASM_IRQFLAGS_H

#define __ASM_IRQFLAGS_H



#ifdef __KERNEL__

#include <linux/types.h>



#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 2)
@@ -102,5 +100,4 @@ static inline int raw_irqs_disabled_flags(unsigned long flags) 
/* For spinlocks etc */

#define raw_local_irq_save(x)	((x) = raw_local_irq_disable())



#endif /* __KERNEL__ */

#endif /* __ASM_IRQFLAGS_H */

arch/s390/kernel/entry.S

+1 −0
Original line number Diff line number Diff line
@@ -571,6 +571,7 @@ pgm_svcper: 
	mvc	__THREAD_per+__PER_access_id(1,%r8),__LC_PER_ACCESS_ID

	oi	__TI_flags+3(%r9),_TIF_SINGLE_STEP # set TIF_SINGLE_STEP

	TRACE_IRQS_ON

	lm	%r2,%r6,SP_R2(%r15)	# load svc arguments

	stosm	__SF_EMPTY(%r15),0x03	# reenable interrupts

	b	BASED(sysc_do_svc)

arch/s390/kernel/entry64.S

+1 −0
Original line number Diff line number Diff line
@@ -549,6 +549,7 @@ pgm_svcper: 
	mvc	__THREAD_per+__PER_access_id(1,%r8),__LC_PER_ACCESS_ID

	oi	__TI_flags+7(%r9),_TIF_SINGLE_STEP # set TIF_SINGLE_STEP

	TRACE_IRQS_ON

	lmg	%r2,%r6,SP_R2(%r15)	# load svc arguments

	stosm	__SF_EMPTY(%r15),0x03	# reenable interrupts

	j	sysc_do_svc

arch/s390/kernel/signal.c

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ SYSCALL_DEFINE3(sigsuspend, int, history0, int, history1, old_sigset_t, mask) 
	recalc_sigpending();

	spin_unlock_irq(&current->sighand->siglock);



	current->state = TASK_INTERRUPTIBLE;

	set_current_state(TASK_INTERRUPTIBLE);

	schedule();

	set_thread_flag(TIF_RESTORE_SIGMASK);

drivers/s390/block/dasd.c

+4 −4
Original line number Diff line number Diff line
@@ -1004,8 +1004,8 @@ static void dasd_handle_killed_request(struct ccw_device *cdev, 
	if (device == NULL ||

	    device != dasd_device_from_cdev_locked(cdev) ||

	    strncmp(device->discipline->ebcname, (char *) &cqr->magic, 4)) {

		DBF_DEV_EVENT(DBF_DEBUG, device, "invalid device in request: "

			      "bus_id %s", dev_name(&cdev->dev));

		DBF_EVENT_DEVID(DBF_DEBUG, cdev, "%s",

				"invalid device in request");

		return;

	}
@@ -1078,8 +1078,8 @@ void dasd_int_handler(struct ccw_device *cdev, unsigned long intparm, 
	device = (struct dasd_device *) cqr->startdev;

	if (!device ||

	    strncmp(device->discipline->ebcname, (char *) &cqr->magic, 4)) {

		DBF_DEV_EVENT(DBF_DEBUG, device, "invalid device in request: "

			      "bus_id %s", dev_name(&cdev->dev));

		DBF_EVENT_DEVID(DBF_DEBUG, cdev, "%s",

				"invalid device in request");

		return;

	}