From 8a6c46e25a27368b90200488fef667733b88ddfc Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Sun, 4 Jul 2010 00:02:28 +0200 Subject: [PATCH] --- yaml --- r: 219543 b: refs/heads/master c: 991f739544a0923b70fb69b115edb880ff9fcc4a h: refs/heads/master i: 219541: 882b60f48b9b8ad0132e4b2747e4f8b428d65702 219539: 32369bad762e0ab3cc5e04bc12408655fadf3173 219535: 71ffa8202dbef5befb954db04a592c5121238712 v: v3 --- [refs] | 2 +- trunk/drivers/pci/proc.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c1cc7b7f5769..4a84e06c21db 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 93e75faba3982767d425323aec5726282d3ad7a2 +refs/heads/master: 991f739544a0923b70fb69b115edb880ff9fcc4a diff --git a/trunk/drivers/pci/proc.c b/trunk/drivers/pci/proc.c index 01f0306525a5..297b72c880a1 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; } @@ -306,6 +303,7 @@ static const struct file_operations proc_bus_pci_operations = { .read = proc_bus_pci_read, .write = proc_bus_pci_write, .unlocked_ioctl = proc_bus_pci_ioctl, + .compat_ioctl = proc_bus_pci_ioctl, #ifdef HAVE_PCI_MMAP .open = proc_bus_pci_open, .release = proc_bus_pci_release,