aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-11-27 07:28:47 +0900
committerLinus Torvalds <torvalds@linux-foundation.org>2010-11-27 07:28:47 +0900
commitfbe6c4047f011d76be83bc2380531cd4fb6aa0e6 (patch)
treec4f9bee27e330093fc2d365a2dedc84f1c524124 /include
parentd2f30c73aba19be828c759edcd21140390cd06e4 (diff)
parent4917b284db8607e414c334317b7d15239854d39c (diff)
downloadmrst-s0i3-test-fbe6c4047f011d76be83bc2380531cd4fb6aa0e6.tar.gz
mrst-s0i3-test-fbe6c4047f011d76be83bc2380531cd4fb6aa0e6.tar.xz
mrst-s0i3-test-fbe6c4047f011d76be83bc2380531cd4fb6aa0e6.zip
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: dmar, x86: Use function stubs when CONFIG_INTR_REMAP is disabled x86-64: Fix and clean up AMD Fam10 MMCONF enabling x86: UV: Address interrupt/IO port operation conflict x86: Use online node real index in calulate_tbl_offset() x86, asm: Fix binutils 2.15 build failure
Diffstat (limited to 'include')
-rw-r--r--include/linux/dmar.h17
1 files changed, 14 insertions, 3 deletions
diff --git a/include/linux/dmar.h b/include/linux/dmar.h
index a7d9dc21391..7b776d71d36 100644
--- a/include/linux/dmar.h
+++ b/include/linux/dmar.h
@@ -175,10 +175,21 @@ static inline int set_msi_sid(struct irte *irte, struct pci_dev *dev)
return 0;
}
-#define enable_intr_remapping(mode) (-1)
-#define disable_intr_remapping() (0)
-#define reenable_intr_remapping(mode) (0)
#define intr_remapping_enabled (0)
+
+static inline int enable_intr_remapping(int eim)
+{
+ return -1;
+}
+
+static inline void disable_intr_remapping(void)
+{
+}
+
+static inline int reenable_intr_remapping(int eim)
+{
+ return 0;
+}
#endif
/* Can't use the common MSI interrupt functions