Please pull git390 'for-linus' branch
Subsystems (4)
Please pull from 'for-linus' branch of
git://git390.osdl.marist.edu/pub/scm/linux-2.6.git for-linus
to receive the following updates:
arch/s390/kernel/head31.S | 4 +-- arch/s390/kernel/head64.S | 4 +-- arch/s390/kernel/setup.c | 46 ++++++++++++++++++++++++++++-------- drivers/s390/block/xpram.c | 17 +++++++++++-- drivers/s390/char/raw3270.c | 52 +++++++++++++++++++++++++++-------------- drivers/s390/char/tape_class.c | 10 +++++++ drivers/s390/char/tape_core.c | 18 ++++++++------ drivers/s390/cio/cmf.c | 1 drivers/s390/net/ctcmain.c | 21 +++++++++++++--- drivers/s390/net/qeth_main.c | 7 +++-- include/asm-s390/system.h | 9 +++++-- include/asm-s390/timex.h | 4 +-- 12 files changed, 140 insertions(+), 53 deletions(-)
Andreas Krebbel:
[S390] get_clock inline assembly.
Cornelia Huck:
[S390] channel measurement interval display.
Heiko Carstens:
[S390] Fix gcc warning about unused return values. [S390] xpram module parameter parsing - take 2. [S390] .align 4096 statements in head.S [S390] sysfs_create_xxx return values.
arch/s390/kernel/head31.S +2 -2
@@ -273,7 +273,7 @@ # .Lbss_end: .long _end .Lparmaddr: .long PARMAREA .Lsccbaddr: .long .Lsccb - .align 4096 + .org 0x12000 .Lsccb: .hword 0x1000 # length, one page .byte 0x00,0x00,0x00
@@ -290,7 +290,7 @@ # .Lscpincr2: .quad 0x00 .fill 3984,1,0 - .align 4096 + .org 0x13000 #ifdef CONFIG_SHARED_KERNEL .org 0x100000
arch/s390/kernel/head64.S +2 -2
@@ -268,7 +268,7 @@ # .Lparmaddr: .quad PARMAREA - .align 4096 + .org 0x12000 .Lsccb: .hword 0x1000 # length, one page .byte 0x00,0x00,0x00
@@ -285,7 +285,7 @@ # .Lscpincr2: .quad 0x00 .fill 3984,1,0 - .align 4096 + .org 0x13000 #ifdef CONFIG_SHARED_KERNEL .org 0x100000
arch/s390/kernel/setup.c +36 -10
67 lines not on this page · raw message
drivers/s390/block/xpram.c +14 -3
@@ -304,6 +304,7 @@ static int __init xpram_setup_sizes(unsi {unsigned long mem_needed;unsigned long mem_auto; +unsigned long long size;int mem_auto_no;int i;
@@ -321,9 +322,19 @@ static int __init xpram_setup_sizes(unsi mem_needed =0 ; mem_auto_no =0 ;for (i =0 ; i < xpram_devs; i++) { -if (sizes[i]) - xpram_sizes[i] = - (memparse (sizes[i], &sizes[i]) +3 ) &-4UL ; +if (sizes[i]) { + size =simple_strtoull (sizes[i], &sizes[i],0 ); +switch (sizes[i][0 ]) { +case 'g' : +case 'G' : + size <<=20 ; +break ; +case 'm' : +case 'M' : + size <<=10 ; + } + xpram_sizes[i] = (size +3 ) &-4UL ; + }if (xpram_sizes[i]) mem_needed += xpram_sizes[i];else
drivers/s390/char/raw3270.c +35 -17
73 lines not on this page · raw message
drivers/s390/char/tape_class.c +9 -1
@@ -76,14 +76,22 @@ struct tape_class_device *register_tape_ device,"%s" , tcd->device_name ); -sysfs_create_link ( + rc =PTR_ERR (tcd->class_device); +if (rc) + goto fail_with_cdev; + rc =sysfs_create_link ( &device->kobj, &tcd->class_device->kobj, tcd->mode_name ); +if (rc) + goto fail_with_class_device;return tcd; +fail_with_class_device: +class_device_destroy (tape_class, tcd->char_device->dev); + fail_with_cdev:cdev_del (tcd->char_device);
drivers/s390/char/tape_core.c +11 -7
@@ -543,20 +543,24 @@ int tape_generic_probe(struct ccw_device *cdev) {struct tape_device *device; +int ret; device =tape_alloc_device ();if (IS_ERR (device))return -ENODEV ; -PRINT_INFO ("tape device %s found\n" , cdev->dev.bus_id); +ccw_device_set_options (cdev,CCWDEV_DO_PATHGROUP ); + ret =sysfs_create_group (&cdev->dev.kobj, &tape_attr_group); +if (ret) { +tape_put_device (device); +PRINT_ERR ("probe failed for tape device %s\n" , cdev->dev.bus_id); +return ret; + } cdev->dev.driver_data = device; + cdev->handler = __tape_do_irq; device->cdev = cdev; device->cdev_id =busid_to_int (cdev->dev.bus_id); - cdev->handler = __tape_do_irq; - -ccw_device_set_options (cdev,CCWDEV_DO_PATHGROUP ); -sysfs_create_group (&cdev->dev.kobj, &tape_attr_group); - -return 0 ; +PRINT_INFO ("tape device %s found\n" , cdev->dev.bus_id); +return ret; } static inline void
drivers/s390/cio/cmf.c +1 -0
@@ -1068,6 +1068,7 @@ cmb_show_avg_sample_interval(struct deviif (count) { interval = cmb_data->last_update - cdev->private->cmb_start_time; + interval = (interval *1000 ) >>12 ; interval /= count; }else interval =-1 ;
drivers/s390/net/ctcmain.c +17 -4
@@ -2686,9 +2686,17 @@ static struct attribute_group ctc_attr_gstatic int ctc_add_attributes (struct device *dev) { -device_create_file (dev, &dev_attr_loglevel); -device_create_file (dev, &dev_attr_stats); -return 0 ; +int rc; + + rc =device_create_file (dev, &dev_attr_loglevel); +if (rc) + goto out; + rc =device_create_file (dev, &dev_attr_stats); +if (!rc) + goto out; +device_remove_file (dev, &dev_attr_loglevel); +out: +return rc; } static void
@@ -2901,7 +2909,12 @@ ctc_new_device(struct ccwgroup_device *c goto out; } -ctc_add_attributes (&cgdev->dev); +if (ctc_add_attributes (&cgdev->dev)) { +ctc_netdev_unregister (dev); + dev->priv =NULL ; +ctc_free_netdevice (dev,1 ); + goto out; + }strlcpy (privptr->fsm->name, dev->name,sizeof (privptr->fsm->name));
drivers/s390/net/qeth_main.c +4 -3
@@ -8451,10 +8451,11 @@ __qeth_reboot_event_card(struct device *static int qeth_reboot_event (struct notifier_block *this,unsigned long event,void *ptr) { +int ret; -driver_for_each_device (&qeth_ccwgroup_driver.driver,NULL ,NULL , - __qeth_reboot_event_card); -return NOTIFY_DONE ; + ret =driver_for_each_device (&qeth_ccwgroup_driver.driver,NULL ,NULL , + __qeth_reboot_event_card); +return ret ?NOTIFY_BAD :NOTIFY_DONE ; }
include/asm-s390/system.h +7 -2
@@ -128,8 +128,13 @@ #define finish_arch_switch(prev) do {#define nop () __asm__ __volatile__ ("nop") -#define xchg (ptr,x) \ - ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(void *)(ptr),sizeof(*(ptr)))) +#define xchg (ptr,x) \ +({ \ + __typeof__(*(ptr)) __ret; \ + __ret = (__typeof__(*(ptr))) \ + __xchg((unsigned long)(x), (void *)(ptr),sizeof(*(ptr))); \ + __ret; \ +})static inline unsigned long __xchg (unsigned long x,void * ptr,int size) {
include/asm-s390/timex.h +2 -2
@@ -19,7 +19,7 @@ static inline cycles_t get_cycles(void) {cycles_t cycles; - __asm__("stck 0(%1)" :"=m" (cycles) :"a" (&cycles) :"cc" ); + __asm__ __volatile__ ("stck 0(%1)" :"=m" (cycles) :"a" (&cycles) :"cc" );return cycles >>2 ; }
@@ -27,7 +27,7 @@ static inline unsigned long long get_clo {unsigned long long clk; - __asm__("stck 0(%1)" :"=m" (clk) :"a" (&clk) :"cc" ); + __asm__ __volatile__ ("stck 0(%1)" :"=m" (clk) :"a" (&clk) :"cc" );return clk; }