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; }