diff --git a/[refs] b/[refs]
index b1c1d25e6212..dd32c0bc3411 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ca24814247fa4c039b893bf80fc05d0e5d41b00
+refs/heads/master: 60ac8f20feb0bba8caee63be3e7ca5801fe16d4c
diff --git a/trunk/drivers/pci/hotplug/cpqphp_ctrl.c b/trunk/drivers/pci/hotplug/cpqphp_ctrl.c
index 79ff6b4de3a6..37d72f123a80 100644
--- a/trunk/drivers/pci/hotplug/cpqphp_ctrl.c
+++ b/trunk/drivers/pci/hotplug/cpqphp_ctrl.c
@@ -1746,10 +1746,8 @@ static void pushbutton_helper_thread(unsigned long data)
 static int event_thread(void* data)
 {
 	struct controller *ctrl;
-	lock_kernel();
+
 	daemonize("phpd_event");
-	
-	unlock_kernel();
 
 	while (1) {
 		dbg("!!!!event_thread sleeping\n");