Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 991f7395 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Jesse Barnes
Browse files

PCI: kill BKL in /proc/pci 



All operations in the pci procfs ioctl functions are
atomic, so no lock is needed here.

Also add a compat_ioctl method, since all the commands
are compatible in 32 bit mode.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: Tejun Heo <tj@kernel.org>
Cc: linux-pci@vger.kernel.org
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 93e75fab

drivers/pci/proc.c

+1 −3
Original line number Diff line number Diff line
@@ -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,