* [patch 1/2] Add missing die_notifier() call to die().
2007-11-20 10:10 [patch 0/2] 2.6.24-rc s390 patch queue Martin Schwidefsky
@ 2007-11-20 10:10 ` Martin Schwidefsky
2007-11-20 10:10 ` [patch 2/2] cio: Register/unregister subchannels only from kslowcrw Martin Schwidefsky
1 sibling, 0 replies; 3+ messages in thread
From: Martin Schwidefsky @ 2007-11-20 10:10 UTC (permalink / raw)
To: linux-kernel, linux-s390; +Cc: Heiko Carstens, Martin Schwidefsky
[-- Attachment #1: 011-die-notifier.diff --]
[-- Type: text/plain, Size: 814 bytes --]
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
---
arch/s390/kernel/traps.c | 1 +
1 file changed, 1 insertion(+)
Index: quilt-2.6/arch/s390/kernel/traps.c
===================================================================
--- quilt-2.6.orig/arch/s390/kernel/traps.c
+++ quilt-2.6/arch/s390/kernel/traps.c
@@ -260,6 +260,7 @@ void die(const char * str, struct pt_reg
bust_spinlocks(1);
printk("%s: %04lx [#%d]\n", str, err & 0xffff, ++die_counter);
print_modules();
+ notify_die(DIE_OOPS, str, regs, err, current->thread.trap_no, SIGSEGV);
show_regs(regs);
bust_spinlocks(0);
add_taint(TAINT_DIE);
--
blue skies,
Martin.
"Reality continues to ruin my life." - Calvin.
^ permalink raw reply [flat|nested] 3+ messages in thread* [patch 2/2] cio: Register/unregister subchannels only from kslowcrw.
2007-11-20 10:10 [patch 0/2] 2.6.24-rc s390 patch queue Martin Schwidefsky
2007-11-20 10:10 ` [patch 1/2] Add missing die_notifier() call to die() Martin Schwidefsky
@ 2007-11-20 10:10 ` Martin Schwidefsky
1 sibling, 0 replies; 3+ messages in thread
From: Martin Schwidefsky @ 2007-11-20 10:10 UTC (permalink / raw)
To: linux-kernel, linux-s390; +Cc: Cornelia Huck, Martin Schwidefsky
[-- Attachment #1: 012-cio-kslowcrw.diff --]
[-- Type: text/plain, Size: 1591 bytes --]
From: Cornelia Huck <cornelia.huck@de.ibm.com>
Make sure all subchannel handling is done on the slow path workqueue
so that we don't have races between an old subchannel unregistering
and a new subchannel with the same name registering.
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
---
drivers/s390/cio/css.c | 2 +-
drivers/s390/cio/device_fsm.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Index: quilt-2.6/drivers/s390/cio/css.c
===================================================================
--- quilt-2.6.orig/drivers/s390/cio/css.c
+++ quilt-2.6/drivers/s390/cio/css.c
@@ -483,7 +483,7 @@ static DECLARE_WORK(css_reprobe_work, re
void css_schedule_reprobe(void)
{
need_reprobe = 1;
- queue_work(ccw_device_work, &css_reprobe_work);
+ queue_work(slow_path_wq, &css_reprobe_work);
}
EXPORT_SYMBOL_GPL(css_schedule_reprobe);
Index: quilt-2.6/drivers/s390/cio/device_fsm.c
===================================================================
--- quilt-2.6.orig/drivers/s390/cio/device_fsm.c
+++ quilt-2.6/drivers/s390/cio/device_fsm.c
@@ -1034,7 +1034,7 @@ device_trigger_reprobe(struct subchannel
if (sch->schib.pmcw.dev != cdev->private->dev_id.devno) {
PREPARE_WORK(&cdev->private->kick_work,
ccw_device_move_to_orphanage);
- queue_work(ccw_device_work, &cdev->private->kick_work);
+ queue_work(slow_path_wq, &cdev->private->kick_work);
} else
ccw_device_start_id(cdev, 0);
}
--
blue skies,
Martin.
"Reality continues to ruin my life." - Calvin.
^ permalink raw reply [flat|nested] 3+ messages in thread