Commit 65f116f5 authored by H. Peter Anvin's avatar H. Peter Anvin

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: default avatarH. Peter Anvin <hpa@zytor.com>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
LKML-Reference: <20091119202341.GA4420@sgi.com>
parent 8a271389
...@@ -61,6 +61,12 @@ struct e820map { ...@@ -61,6 +61,12 @@ struct e820map {
struct e820entry map[E820_X_MAX]; 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__ #ifdef __KERNEL__
/* see comment in arch/x86/kernel/e820.c */ /* see comment in arch/x86/kernel/e820.c */
extern struct e820map e820; extern struct e820map e820;
...@@ -126,15 +132,14 @@ extern void e820_reserve_resources(void); ...@@ -126,15 +132,14 @@ extern void e820_reserve_resources(void);
extern void e820_reserve_resources_late(void); extern void e820_reserve_resources_late(void);
extern void setup_memory_map(void); extern void setup_memory_map(void);
extern char *default_machine_specific_memory_setup(void); extern char *default_machine_specific_memory_setup(void);
#endif /* __KERNEL__ */
#endif /* __ASSEMBLY__ */
#define ISA_START_ADDRESS 0xa0000 static inline bool is_ISA_range(u64 s, u64 e)
#define ISA_END_ADDRESS 0x100000 {
#define is_ISA_range(s, e) ((s) >= ISA_START_ADDRESS && (e) < ISA_END_ADDRESS) return s >= ISA_START_ADDRESS && e < ISA_END_ADDRESS;
}
#define BIOS_BEGIN 0x000a0000 #endif /* __KERNEL__ */
#define BIOS_END 0x00100000 #endif /* __ASSEMBLY__ */
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <linux/ioport.h> #include <linux/ioport.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment