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/appldata/appldata_base.c | 2 arch/s390/mm/init.c | 6 +- drivers/s390/block/dasd.c | 2 drivers/s390/block/dasd_devmap.c | 84 +++++++++++++++++-------------------- drivers/s390/block/dasd_eckd.c | 8 +-- drivers/s390/block/xpram.c | 25 ----------- drivers/s390/char/tape_class.c | 2 drivers/s390/cio/device_fsm.c | 1 drivers/s390/cio/device_ops.c | 3 + 9 files changed, 55 insertions(+), 78 deletions(-)
Cornelia Huck:
[S390] retry after deferred condition code.
Gerald Schaefer:
[S390] add __cpuinit to appldata_cpu_notify
Heiko Carstens:
[S390] tape class return value handling.
[S390] dasd slab cache alignment.
[S390] kernel page table allocation.
Horst Hummel:
[S390] dasd set offline kernel bug.
[S390] dasd calls kzalloc while holding a spinlock.
Martin Schwidefsky:
[S390] xpram system device class.
Peter Oberparleiter:
[S390] lost interrupt after chpid vary off/on cycle. [S390] inaccessible PAV alias devices on LPAR.
arch/s390/appldata/appldata_base.c +1 -1
@@ -618,7 +618,7 @@ appldata_offline_cpu(int cpu) }#ifdef CONFIG_HOTPLUG_CPU -static int +static int __cpuinit appldata_cpu_notify (struct notifier_block *self,unsigned long action,void *hcpu) {
arch/s390/mm/init.c +3 -3
@@ -129,7 +129,7 @@ void __init paging_init(void)/* * pg_table is physical at this point */ - pg_table = (pte_t *)alloc_bootmem_low_pages (PAGE_SIZE ); + pg_table = (pte_t *)alloc_bootmem_pages (PAGE_SIZE ); pg_dir->pgd0 = (_PAGE_TABLE |__pa (pg_table)); pg_dir->pgd1 = (_PAGE_TABLE | (__pa (pg_table)+1024 ));
@@ -219,7 +219,7 @@ void __init paging_init(void)continue ; } - pm_dir = (pmd_t *)alloc_bootmem_low_pages (PAGE_SIZE *4 ); + pm_dir = (pmd_t *)alloc_bootmem_pages (PAGE_SIZE *4 );pgd_populate (&init_mm, pg_dir, pm_dir);for (j =0 ; j <PTRS_PER_PMD ; j++,pm_dir++) {
@@ -228,7 +228,7 @@ void __init paging_init(void)continue ; } - pt_dir = (pte_t *)alloc_bootmem_low_pages (PAGE_SIZE ); + pt_dir = (pte_t *)alloc_bootmem_pages (PAGE_SIZE );pmd_populate_kernel (&init_mm, pm_dir, pt_dir);for (k =0 ; k <PTRS_PER_PTE ; k++,pt_dir++) {
drivers/s390/block/dasd.c +1 -1
@@ -1730,8 +1730,8 @@ dasd_flush_request_queue(struct dasd_dev req =elv_next_request (device->request_queue);if (req ==NULL )break ; -dasd_end_request (req,0 );blkdev_dequeue_request (req); +dasd_end_request (req,0 ); }spin_unlock_irq (&device->request_queue_lock); }
drivers/s390/block/dasd_devmap.c +40 -44
141 lines not on this page · raw message
drivers/s390/block/dasd_eckd.c +4 -4
@@ -468,11 +468,11 @@ dasd_eckd_generate_uid(struct dasd_devicreturn -ENODEV ;memset (uid,0 ,sizeof (struct dasd_uid )); -strncpy (uid->vendor, confdata->ned1.HDA_manufacturer, -sizeof (uid->vendor) -1 ); +memcpy (uid->vendor, confdata->ned1.HDA_manufacturer, +sizeof (uid->vendor) -1 );EBCASC (uid->vendor,sizeof (uid->vendor) -1 ); -strncpy (uid->serial, confdata->ned1.HDA_location, -sizeof (uid->serial) -1 ); +memcpy (uid->serial, confdata->ned1.HDA_location, +sizeof (uid->serial) -1 );EBCASC (uid->serial,sizeof (uid->serial) -1 ); uid->ssid = confdata->neq.subsystemID;if (confdata->ned2.sneq.flags ==0x40 ) {
drivers/s390/block/xpram.c +1 -24
@@ -48,15 +48,6 @@ #define PRINT_WARN(x...) printk(KERN_WAR #define PRINT_ERR(x...) printk(KERN_ERR XPRAM_NAME " error:" x) -static struct sysdev_class xpram_sysclass = { -set_kset_name ("xpram" ), -}; - -static struct sys_device xpram_sys_device = { - .id =0 , - .cls = &xpram_sysclass, -}; - typedef struct { unsigned int size; /* size of xpram segment in pages */ unsigned int offset; /* start page of xpram segment */
@@ -451,8 +442,6 @@ static void __exit xpram_exit(void) }unregister_blkdev (XPRAM_MAJOR ,XPRAM_NAME );blk_cleanup_queue (xpram_queue); -sysdev_unregister (&xpram_sys_device); -sysdev_class_unregister (&xpram_sysclass); }static int __init xpram_init (void )
@@ -470,19 +459,7 @@ static int __init xpram_init(void) rc =xpram_setup_sizes (xpram_pages);if (rc)return rc; - rc =sysdev_class_register (&xpram_sysclass); -if (rc) -return rc; - - rc =sysdev_register (&xpram_sys_device); -if (rc) { -sysdev_class_unregister (&xpram_sysclass); -return rc; - } - rc =xpram_setup_blkdev (); -if (rc) -sysdev_unregister (&xpram_sys_device); -return rc; +return xpram_setup_blkdev (); }module_init (xpram_init);
drivers/s390/char/tape_class.c +1 -1
@@ -76,7 +76,7 @@ struct tape_class_device *register_tape_ device,"%s" , tcd->device_name ); - rc =PTR_ERR (tcd->class_device); + rc =IS_ERR (tcd->class_device) ?PTR_ERR (tcd->class_device) :0 ;if (rc) goto fail_with_cdev; rc = sysfs_create_link(
drivers/s390/cio/device_fsm.c +1 -0
@@ -772,6 +772,7 @@ ccw_device_online_verify(struct ccw_devistsch (sch->schid, &sch->schib);if (sch->schib.scsw.actl !=0 || + (sch->schib.scsw.stctl &SCSW_STCTL_STATUS_PEND ) || (cdev->private->irb.scsw.stctl &SCSW_STCTL_STATUS_PEND )) {/* * No final status yet or final status not yet delivered
drivers/s390/cio/device_ops.c +3 -0
@@ -263,6 +263,9 @@ ccw_device_wake_up(struct ccw_device *cd/* Abuse intparm for error reporting. */ if (IS_ERR (irb)) cdev->private->intparm = -EIO ; +else if (irb->scsw.cc ==1 ) +/* Retry for deferred condition code. */ + cdev->private->intparm = -EAGAIN ;else if ((irb->scsw.dstat != (DEV_STAT_CHN_END |DEV_STAT_DEV_END )) || (irb->scsw.cstat !=0 )) {
Quoted 6 lines · Martin Schwidefsky
Please pull from 'for-linus' branch of
git://git390.osdl.marist.edu/pub/scm/linux-2.6.git for-linusto receive the following updates:
Quoted 10 lines
arch/s390/appldata/appldata_base.c | 2 arch/s390/mm/init.c | 6 +- drivers/s390/block/dasd.c | 2 drivers/s390/block/dasd_devmap.c | 84 +++++++++++++++++-------------------- drivers/s390/block/dasd_eckd.c | 8 +-- drivers/s390/block/xpram.c | 25 ----------- drivers/s390/char/tape_class.c | 2 drivers/s390/cio/device_fsm.c | 1 drivers/s390/cio/device_ops.c | 3 + 9 files changed, 55 insertions(+), 78 deletions(-)
Hm, I got:
arch/s390/appldata/appldata_base.c | 2 - arch/s390/mm/init.c | 6 +-- drivers/s390/block/dasd.c | 2 - drivers/s390/block/dasd_devmap.c | 84 +++++++++++++++++------------------- drivers/s390/block/dasd_eckd.c | 8 ++- drivers/s390/block/xpram.c | 25 ----------- 6 files changed, 50 insertions(+), 77 deletions(-)
instead when pulling. I've pushed out my tree so you can see what is missing.
thanks,
greg k-h
Quoted 26 lines · Greg KH
Quoted 6 lines
Please pull from 'for-linus' branch of
git://git390.osdl.marist.edu/pub/scm/linux-2.6.git for-linusto receive the following updates:
Quoted 10 lines
arch/s390/appldata/appldata_base.c | 2 arch/s390/mm/init.c | 6 +- drivers/s390/block/dasd.c | 2 drivers/s390/block/dasd_devmap.c | 84 +++++++++++++++++-------------------- drivers/s390/block/dasd_eckd.c | 8 +-- drivers/s390/block/xpram.c | 25 ----------- drivers/s390/char/tape_class.c | 2 drivers/s390/cio/device_fsm.c | 1 drivers/s390/cio/device_ops.c | 3 + 9 files changed, 55 insertions(+), 78 deletions(-)Hm, I got:
arch/s390/appldata/appldata_base.c | 2 - arch/s390/mm/init.c | 6 +-- drivers/s390/block/dasd.c | 2 - drivers/s390/block/dasd_devmap.c | 84 +++++++++++++++++------------------- drivers/s390/block/dasd_eckd.c | 8 ++- drivers/s390/block/xpram.c | 25 ----------- 6 files changed, 50 insertions(+), 77 deletions(-)
Quoted 1 line
instead when pulling. I've pushed out my tree so you can see what is missing.
That is strange. Just tested it again and I get:
Fast forward
arch/s390/appldata/appldata_base.c | 2 - arch/s390/mm/init.c | 6 +-- drivers/s390/block/dasd.c | 2 - drivers/s390/block/dasd_devmap.c | 84 +++++++++++++++++------------------- drivers/s390/block/dasd_eckd.c | 8 ++- drivers/s390/block/xpram.c | 25 ----------- drivers/s390/char/tape_class.c | 2 - drivers/s390/cio/device_fsm.c | 1 drivers/s390/cio/device_ops.c | 3 + 9 files changed, 55 insertions(+), 78 deletions(-)
Do you keep a local copy of the git390 tree on you harddrive ?
Signature · 8 lines
blue skies, Martin. Martin Schwidefsky Linux for zSeries Development & Services IBM Deutschland Entwicklung GmbH "Reality continues to ruin my life." - Calvin.
Quoted 43 lines · Martin Schwidefsky
Quoted 26 lines · Greg KH
Quoted 6 lines
Please pull from 'for-linus' branch of
git://git390.osdl.marist.edu/pub/scm/linux-2.6.git for-linusto receive the following updates:
Quoted 10 lines
arch/s390/appldata/appldata_base.c | 2 arch/s390/mm/init.c | 6 +- drivers/s390/block/dasd.c | 2 drivers/s390/block/dasd_devmap.c | 84 +++++++++++++++++-------------------- drivers/s390/block/dasd_eckd.c | 8 +-- drivers/s390/block/xpram.c | 25 ----------- drivers/s390/char/tape_class.c | 2 drivers/s390/cio/device_fsm.c | 1 drivers/s390/cio/device_ops.c | 3 + 9 files changed, 55 insertions(+), 78 deletions(-)Hm, I got:
arch/s390/appldata/appldata_base.c | 2 - arch/s390/mm/init.c | 6 +-- drivers/s390/block/dasd.c | 2 - drivers/s390/block/dasd_devmap.c | 84 +++++++++++++++++------------------- drivers/s390/block/dasd_eckd.c | 8 ++- drivers/s390/block/xpram.c | 25 ----------- 6 files changed, 50 insertions(+), 77 deletions(-)Quoted 1 line
instead when pulling. I've pushed out my tree so you can see what is missing.
That is strange. Just tested it again and I get:
Fast forward
arch/s390/appldata/appldata_base.c | 2 - arch/s390/mm/init.c | 6 +-- drivers/s390/block/dasd.c | 2 - drivers/s390/block/dasd_devmap.c | 84 +++++++++++++++++------------------- drivers/s390/block/dasd_eckd.c | 8 ++- drivers/s390/block/xpram.c | 25 ----------- drivers/s390/char/tape_class.c | 2 - drivers/s390/cio/device_fsm.c | 1 drivers/s390/cio/device_ops.c | 3 + 9 files changed, 55 insertions(+), 78 deletions(-)
Quoted 1 line
Do you keep a local copy of the git390 tree on you harddrive ?
No, what happened is that you had three changesets in your tree that I had already pulled from last week. Those did not show up in this diffstat as they were already present in my tree.
So all should be fine.
thanks,
greg k-h
Quoted 3 lines · Greg KH
No, what happened is that you had three changesets in your tree that I had already pulled from last week. Those did not show up in this diffstat as they were already present in my tree.
Now that you point it out, it is obvious.
Quoted 1 line
So all should be fine.
Indeed.
Signature · 8 lines
blue skies, Martin. Martin Schwidefsky Linux for zSeries Development & Services IBM Deutschland Entwicklung GmbH "Reality continues to ruin my life." - Calvin.