From 107ea7673de57ead09df7f12972ea857fffc99ce Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Wed, 28 Mar 2012 12:20:58 +0000 Subject: [PATCH] --- yaml --- r: 298407 b: refs/heads/master c: 9b218f63e50e590fe0c7724a0838d7eaa6dae5ce h: refs/heads/master i: 298405: 4c77a69bb24474b5d95f2873a56d322394ed0ffa 298403: e9b7542906aabe20c5432933b062d9000f75ff98 298399: f714ff3a5bec401d5e764704fee0461fa2fe3e46 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/pseries/eeh_event.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3e3bae6824c5..8dbfb202f0ae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 37ef9bd48af6ab9a3d1fd28df4f929abc19f2cc3 +refs/heads/master: 9b218f63e50e590fe0c7724a0838d7eaa6dae5ce diff --git a/trunk/arch/powerpc/platforms/pseries/eeh_event.c b/trunk/arch/powerpc/platforms/pseries/eeh_event.c index 92dd84c124f1..4cb375c0f8d1 100644 --- a/trunk/arch/powerpc/platforms/pseries/eeh_event.c +++ b/trunk/arch/powerpc/platforms/pseries/eeh_event.c @@ -60,7 +60,6 @@ static int eeh_event_handler(void * dummy) struct eeh_dev *edev; set_task_comm(current, "eehd"); - set_current_state(TASK_INTERRUPTIBLE); spin_lock_irqsave(&eeh_eventlist_lock, flags); event = NULL; @@ -83,6 +82,7 @@ static int eeh_event_handler(void * dummy) printk(KERN_INFO "EEH: Detected PCI bus error on device %s\n", eeh_pci_name(edev->pdev)); + set_current_state(TASK_INTERRUPTIBLE); /* Don't add to load average */ edev = handle_eeh_events(event); eeh_clear_slot(eeh_dev_to_of_node(edev), EEH_MODE_RECOVERING);