From: Andrew Morton <akpm@osdl.org>
Date: Sun, 1 Oct 2006 06:27:10 +0000 (-0700)
Subject: [PATCH] arch/i386/pci/mmconfig.c tweaks
X-Git-Tag: v2.6.19-rc1~626
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=be5b7a8987f23281b146f22b13e2079f448c69c7;p=linux-2.6-omap-h63xx.git

[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>
---

diff --git a/arch/i386/pci/mmconfig.c b/arch/i386/pci/mmconfig.c
index 05be8db58a8..d0c3da3aa2a 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) {