diff options
-rw-r--r-- | arch/x86/include/asm/e820.h | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/arch/x86/include/asm/e820.h b/arch/x86/include/asm/e820.h index 40b4e614fe71..68b4e0ec1950 100644 --- a/arch/x86/include/asm/e820.h +++ b/arch/x86/include/asm/e820.h | |||
@@ -61,6 +61,12 @@ struct e820map { | |||
61 | struct e820entry map[E820_X_MAX]; | 61 | struct e820entry map[E820_X_MAX]; |
62 | }; | 62 | }; |
63 | 63 | ||
64 | #define ISA_START_ADDRESS 0xa0000 | ||
65 | #define ISA_END_ADDRESS 0x100000 | ||
66 | |||
67 | #define BIOS_BEGIN 0x000a0000 | ||
68 | #define BIOS_END 0x00100000 | ||
69 | |||
64 | #ifdef __KERNEL__ | 70 | #ifdef __KERNEL__ |
65 | /* see comment in arch/x86/kernel/e820.c */ | 71 | /* see comment in arch/x86/kernel/e820.c */ |
66 | extern struct e820map e820; | 72 | extern struct e820map e820; |
@@ -126,15 +132,14 @@ extern void e820_reserve_resources(void); | |||
126 | extern void e820_reserve_resources_late(void); | 132 | extern void e820_reserve_resources_late(void); |
127 | extern void setup_memory_map(void); | 133 | extern void setup_memory_map(void); |
128 | extern char *default_machine_specific_memory_setup(void); | 134 | extern char *default_machine_specific_memory_setup(void); |
129 | #endif /* __KERNEL__ */ | ||
130 | #endif /* __ASSEMBLY__ */ | ||
131 | 135 | ||
132 | #define ISA_START_ADDRESS 0xa0000 | 136 | static inline bool is_ISA_range(u64 s, u64 e) |
133 | #define ISA_END_ADDRESS 0x100000 | 137 | { |
134 | #define is_ISA_range(s, e) ((s) >= ISA_START_ADDRESS && (e) < ISA_END_ADDRESS) | 138 | return s >= ISA_START_ADDRESS && e < ISA_END_ADDRESS; |
139 | } | ||
135 | 140 | ||
136 | #define BIOS_BEGIN 0x000a0000 | 141 | #endif /* __KERNEL__ */ |
137 | #define BIOS_END 0x00100000 | 142 | #endif /* __ASSEMBLY__ */ |
138 | 143 | ||
139 | #ifdef __KERNEL__ | 144 | #ifdef __KERNEL__ |
140 | #include <linux/ioport.h> | 145 | #include <linux/ioport.h> |