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

Commit 0d6ffdb8 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] dasd: tunable missing interrupt handler
  [S390] dasd: allocate fallback cqr for reserve/release
  [S390] topology: use default MC domain initializer
  [S390] initrd: change default load address
  [S390] cmm, smsgiucv_app: convert sender to uppercase
  [S390] cmm: add missing __init/__exit annotations
  [S390] cio: use all available paths for some internal I/O
  [S390] ccwreq: add ability to use all paths
  [S390] cio: ccw_device_online_store return -EINVAL in case of missing driver
  [S390] cio: Log the response from the unit check handler
  [S390] cio: CHSC SIOSL Support
parents 7233e392 7c8faa86

arch/s390/include/asm/ccwdev.h

+2 −0
Original line number Diff line number Diff line
@@ -208,6 +208,8 @@ extern void ccw_device_get_id(struct ccw_device *, struct ccw_dev_id *); 
extern struct ccw_device *ccw_device_probe_console(void);

extern int ccw_device_force_console(void);



int ccw_device_siosl(struct ccw_device *);



// FIXME: these have to go

extern int _ccw_device_get_subchannel_number(struct ccw_device *);

arch/s390/include/asm/topology.h

+0 −2
Original line number Diff line number Diff line
@@ -30,8 +30,6 @@ static inline void s390_init_cpu_topology(void) 
};

#endif



#define SD_MC_INIT SD_CPU_INIT



#include <asm-generic/topology.h>



#endif /* _ASM_S390_TOPOLOGY_H */

arch/s390/kernel/head.S

+1 −1
Original line number Diff line number Diff line
@@ -366,7 +366,7 @@ iplstart: 
	l	%r1,.Lstartup

	br	%r1



.Linitrd:.long _end + 0x400000		# default address of initrd

.Linitrd:.long _end			# default address of initrd

.Lparm:	.long  PARMAREA

.Lstartup: .long startup

.Lreset:.byte	0xc3,0xc8,0xc1,0xd5,0xc7,0xc5,0x40,0xd9,0xc4,0xd9,0x40

arch/s390/mm/cmm.c

+9 −2
Original line number Diff line number Diff line
@@ -427,7 +427,7 @@ static struct notifier_block cmm_power_notifier = { 
	.notifier_call = cmm_power_event,

};



static int cmm_init(void)

static int __init cmm_init(void)

{

	int rc = -ENOMEM;
@@ -435,6 +435,13 @@ static int cmm_init(void) 
	if (!cmm_sysctl_header)

		goto out_sysctl;

#ifdef CONFIG_CMM_IUCV

	/* convert sender to uppercase characters */

	if (sender) {

		int len = strlen(sender);

		while (len--)

			sender[len] = toupper(sender[len]);

	}



	rc = smsg_register_callback(SMSG_PREFIX, cmm_smsg_target);

	if (rc < 0)

		goto out_smsg;
@@ -467,7 +474,7 @@ out_sysctl: 
}

module_init(cmm_init);



static void cmm_exit(void)

static void __exit cmm_exit(void)

{

	unregister_sysctl_table(cmm_sysctl_header);

#ifdef CONFIG_CMM_IUCV

drivers/s390/block/dasd_devmap.c

+44 −0
Original line number Diff line number Diff line
@@ -1083,6 +1083,49 @@ dasd_eer_store(struct device *dev, struct device_attribute *attr, 


static DEVICE_ATTR(eer_enabled, 0644, dasd_eer_show, dasd_eer_store);



/*

 * expiration time for default requests

 */

static ssize_t

dasd_expires_show(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct dasd_device *device;

	int len;



	device = dasd_device_from_cdev(to_ccwdev(dev));

	if (IS_ERR(device))

		return -ENODEV;

	len = snprintf(buf, PAGE_SIZE, "%lu\n", device->default_expires);

	dasd_put_device(device);

	return len;

}



static ssize_t

dasd_expires_store(struct device *dev, struct device_attribute *attr,

	       const char *buf, size_t count)

{

	struct dasd_device *device;

	unsigned long val;



	device = dasd_device_from_cdev(to_ccwdev(dev));

	if (IS_ERR(device))

		return -ENODEV;



	if ((strict_strtoul(buf, 10, &val) != 0) ||

	    (val > DASD_EXPIRES_MAX) || val == 0) {

		dasd_put_device(device);

		return -EINVAL;

	}



	if (val)

		device->default_expires = val;



	dasd_put_device(device);

	return count;

}



static DEVICE_ATTR(expires, 0644, dasd_expires_show, dasd_expires_store);



static struct attribute * dasd_attrs[] = {

	&dev_attr_readonly.attr,

	&dev_attr_discipline.attr,
@@ -1094,6 +1137,7 @@ static struct attribute * dasd_attrs[] = { 
	&dev_attr_eer_enabled.attr,

	&dev_attr_erplog.attr,

	&dev_attr_failfast.attr,

	&dev_attr_expires.attr,

	NULL,

};