From 6da3f227e7474bc38da5dc0a25ecf812eb2bdefa Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Sat, 30 Sep 2006 23:27:10 -0700
Subject: [PATCH] --- yaml --- r: 37608 b: refs/heads/master c:
 be5b7a8987f23281b146f22b13e2079f448c69c7 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/arch/i386/pci/mmconfig.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c44298d9ce74..0d2128a775c4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 45e0b78b0532f92c01e363dd4287617c5be4574f
+refs/heads/master: be5b7a8987f23281b146f22b13e2079f448c69c7
diff --git a/trunk/arch/i386/pci/mmconfig.c b/trunk/arch/i386/pci/mmconfig.c
index 05be8db58a8c..d0c3da3aa2aa 100644
--- a/trunk/arch/i386/pci/mmconfig.c
+++ b/trunk/arch/i386/pci/mmconfig.c
@@ -67,7 +67,10 @@ static u32 get_base_addr(unsigned int seg, int bus, unsigned devfn)
 	return 0;
 }
 
-static inline void pci_exp_set_dev_base(unsigned int base, int bus, int devfn)
+/*
+ * This is always called under pci_config_lock
+ */
+static void pci_exp_set_dev_base(unsigned int base, int bus, int devfn)
 {
 	u32 dev_base = base | (bus << 20) | (devfn << 12);
 	if (dev_base != mmcfg_last_accessed_device) {