From b2f759f386faa54703e1f653d59958d60ef9ab96 Mon Sep 17 00:00:00 2001
From: Mathieu Segaud <mathieu.segaud@regala.cx>
Date: Thu, 10 Jan 2008 14:27:12 +0100
Subject: [PATCH] --- yaml --- r: 82351 b: refs/heads/master c:
 add771840be591fd926a5ca27c22e622c13d1294 h: refs/heads/master i:   82349:
 4621868f96678770a438cf5e22720f5420bc9d8b   82347:
 1d1d889601d58afa2d0abffafb3fccdbda2ba13d   82343:
 382d3f70b9cbbed8aaf9723679d7fab7a064218b   82335:
 60c12ff15544a7987f6d6f33eae0924e95590cde v: v3

---
 [refs]                   |  2 +-
 trunk/drivers/pci/proc.c | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index b8757ea015d4..74b27a2ae9c5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2326e2b99969e69fedc92de80d80b2d2f92fd942
+refs/heads/master: add771840be591fd926a5ca27c22e622c13d1294
diff --git a/trunk/drivers/pci/proc.c b/trunk/drivers/pci/proc.c
index 48ca9ae29e16..2bf159b9c1cd 100644
--- a/trunk/drivers/pci/proc.c
+++ b/trunk/drivers/pci/proc.c
@@ -11,6 +11,7 @@
 #include <linux/module.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
+#include <linux/smp_lock.h>
 #include <linux/capability.h>
 #include <asm/uaccess.h>
 #include <asm/byteorder.h>
@@ -202,15 +203,18 @@ struct pci_filp_private {
 	int write_combine;
 };
 
-static int proc_bus_pci_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
+static long proc_bus_pci_ioctl(struct file *file, unsigned int cmd,
+			       unsigned long arg)
 {
-	const struct proc_dir_entry *dp = PDE(inode);
+	const struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode);
 	struct pci_dev *dev = dp->data;
 #ifdef HAVE_PCI_MMAP
 	struct pci_filp_private *fpriv = file->private_data;
 #endif /* HAVE_PCI_MMAP */
 	int ret = 0;
 
+	lock_kernel();
+
 	switch (cmd) {
 	case PCIIOC_CONTROLLER:
 		ret = pci_domain_nr(dev->bus);
@@ -239,6 +243,7 @@ static int proc_bus_pci_ioctl(struct inode *inode, struct file *file, unsigned i
 		break;
 	};
 
+	unlock_kernel();
 	return ret;
 }
 
@@ -291,7 +296,7 @@ static const struct file_operations proc_bus_pci_operations = {
 	.llseek		= proc_bus_pci_lseek,
 	.read		= proc_bus_pci_read,
 	.write		= proc_bus_pci_write,
-	.ioctl		= proc_bus_pci_ioctl,
+	.unlocked_ioctl	= proc_bus_pci_ioctl,
 #ifdef HAVE_PCI_MMAP
 	.open		= proc_bus_pci_open,
 	.release	= proc_bus_pci_release,