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