summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2006-09-30 23:27:10 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-01 00:39:18 -0700
commitbe5b7a8987f23281b146f22b13e2079f448c69c7 (patch)
tree41227ddbc82b97095ae45d11b5071c7239868b9b /arch
parent45e0b78b0532f92c01e363dd4287617c5be4574f (diff)
downloadblackbird-op-linux-be5b7a8987f23281b146f22b13e2079f448c69c7.tar.gz
blackbird-op-linux-be5b7a8987f23281b146f22b13e2079f448c69c7.zip
[PATCH] arch/i386/pci/mmconfig.c tweaks
- Add soothing comment - uninline thrice-called function Cc: OGAWA Hirofumi <hogawa@miraclelinux.com> Cc: Andi Kleen <ak@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/i386/pci/mmconfig.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/i386/pci/mmconfig.c b/arch/i386/pci/mmconfig.c
index 05be8db58a8c..d0c3da3aa2aa 100644
--- a/arch/i386/pci/mmconfig.c
+++ b/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) {
OpenPOWER on IntegriCloud