aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/e820.h
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-11-23 14:44:39 -0800
committerH. Peter Anvin <hpa@zytor.com>2009-11-23 17:09:59 -0800
commit65f116f5f16dc3371fce24fb24bc4843b5380ba5 (patch)
tree5937b8af200ae7dbaa7df0b21f448b1149518ffe /arch/x86/include/asm/e820.h
parent8a27138924f64d2f30c1022f909f74480046bc3f (diff)
x86: Change is_ISA_range() into an inline function
Change is_ISA_range() from a macro to an inline function. This makes it type safe, and also allows it to be assigned to a function pointer if necessary. Signed-off-by: H. Peter Anvin <hpa@zytor.com> Acked-by: Thomas Gleixner <tglx@linutronix.de> LKML-Reference: <20091119202341.GA4420@sgi.com>
Diffstat (limited to 'arch/x86/include/asm/e820.h')
-rw-r--r--arch/x86/include/asm/e820.h19
1 files changed, 12 insertions, 7 deletions
diff --git a/arch/x86/include/asm/e820.h b/arch/x86/include/asm/e820.h
index 40b4e614fe7..68b4e0ec195 100644
--- a/arch/x86/include/asm/e820.h
+++ b/arch/x86/include/asm/e820.h
@@ -61,6 +61,12 @@ struct e820map {
struct e820entry map[E820_X_MAX];
};
+#define ISA_START_ADDRESS 0xa0000
+#define ISA_END_ADDRESS 0x100000
+
+#define BIOS_BEGIN 0x000a0000
+#define BIOS_END 0x00100000
+
#ifdef __KERNEL__
/* see comment in arch/x86/kernel/e820.c */
extern struct e820map e820;
@@ -126,15 +132,14 @@ extern void e820_reserve_resources(void);
extern void e820_reserve_resources_late(void);
extern void setup_memory_map(void);
extern char *default_machine_specific_memory_setup(void);
-#endif /* __KERNEL__ */
-#endif /* __ASSEMBLY__ */
-#define ISA_START_ADDRESS 0xa0000
-#define ISA_END_ADDRESS 0x100000
-#define is_ISA_range(s, e) ((s) >= ISA_START_ADDRESS && (e) < ISA_END_ADDRESS)
+static inline bool is_ISA_range(u64 s, u64 e)
+{
+ return s >= ISA_START_ADDRESS && e < ISA_END_ADDRESS;
+}
-#define BIOS_BEGIN 0x000a0000
-#define BIOS_END 0x00100000
+#endif /* __KERNEL__ */
+#endif /* __ASSEMBLY__ */
#ifdef __KERNEL__
#include <linux/ioport.h>