From 3fe0e57de76a9e59e218ac5da632fe724b48ee7d Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 27 Oct 2010 18:34:59 -0700
Subject: [PATCH] --- yaml --- r: 218477 b: refs/heads/master c:
 0b2d8d9e562de3ee2476f549549e4fefbb7a4213 h: refs/heads/master i:   218475:
 f11c27a201afabeb61d30ab3cb0151b8e5a52c5c v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/pci/proc.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 077b27bde567..f2d12ba4900e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 22cdbd1d5789cc16c37102eb6f62c3ae377b849e
+refs/heads/master: 0b2d8d9e562de3ee2476f549549e4fefbb7a4213
diff --git a/trunk/drivers/pci/proc.c b/trunk/drivers/pci/proc.c
index 01f0306525a5..895136f13edc 100644
--- a/trunk/drivers/pci/proc.c
+++ b/trunk/drivers/pci/proc.c
@@ -212,8 +212,6 @@ static long proc_bus_pci_ioctl(struct file *file, unsigned int cmd,
 #endif /* HAVE_PCI_MMAP */
 	int ret = 0;
 
-	lock_kernel();
-
 	switch (cmd) {
 	case PCIIOC_CONTROLLER:
 		ret = pci_domain_nr(dev->bus);
@@ -242,7 +240,6 @@ static long proc_bus_pci_ioctl(struct file *file, unsigned int cmd,
 		break;
 	};
 
-	unlock_kernel();
 	return ret;
 }