From patchwork Tue Sep 14 19:34:53 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 180272 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o8EJZWaA004244 for ; Tue, 14 Sep 2010 19:35:33 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754813Ab0INTfc (ORCPT ); Tue, 14 Sep 2010 15:35:32 -0400 Received: from moutng.kundenserver.de ([212.227.126.187]:54400 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754128Ab0INTfc (ORCPT ); Tue, 14 Sep 2010 15:35:32 -0400 Received: from localhost.localdomain (port-92-200-37-189.dynamic.qsc.de [92.200.37.189]) by mrelayeu.kundenserver.de (node=mrbap0) with ESMTP (Nemesis) id 0LbxOG-1OTzlD3rG8-00j7dL; Tue, 14 Sep 2010 21:35:28 +0200 From: Arnd Bergmann To: arnd@arndb.de Cc: Jesse Barnes , Tejun Heo , linux-pci@vger.kernel.org Subject: [PATCH 02/18] proc/pci: kill BKL Date: Tue, 14 Sep 2010 21:34:53 +0200 Message-Id: <1284492909-7147-3-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1284492909-7147-1-git-send-email-arnd@arndb.de> References: <1284492909-7147-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:TlGyjdZZVWfp49ftIiQq59VwCH6x1cEcTPmbP/c3K2V w0Xgz/GN4rkhoXFUEIQDl4gcCkSwhDfJ0kjQPLgJYbPUhWseOL bttDiXbwGbxdAsHCsEjobegbQOmwMKCUkXIx6ctr+YCagmRICb 7I2St4kXbPt5jI8LKWnwdOuupJYJ43yZrwS3e29g1DuvlUqPrK Rocapf8izsnnKHWml+zNw== Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Tue, 14 Sep 2010 19:35:33 +0000 (UTC) diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c index 01f0306..297b72c 100644 --- a/drivers/pci/proc.c +++ b/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,