Commit 306c142f authored by Ingo Molnar's avatar Ingo Molnar

x86: pat: e820 cleanup

NOP change.
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent e91a3b43
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#include <asm/tlbflush.h> #include <asm/tlbflush.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <asm/proto.h> #include <asm/proto.h>
#include <asm/e820.h>
unsigned long __phys_addr(unsigned long x) unsigned long __phys_addr(unsigned long x)
{ {
...@@ -28,9 +29,6 @@ unsigned long __phys_addr(unsigned long x) ...@@ -28,9 +29,6 @@ unsigned long __phys_addr(unsigned long x)
} }
EXPORT_SYMBOL(__phys_addr); EXPORT_SYMBOL(__phys_addr);
#define ISA_START_ADDRESS 0xa0000
#define ISA_END_ADDRESS 0x100000
/* /*
* Fix up the linear direct mapping of the kernel to avoid cache attribute * Fix up the linear direct mapping of the kernel to avoid cache attribute
* conflicts. * conflicts.
......
...@@ -22,6 +22,9 @@ struct e820map { ...@@ -22,6 +22,9 @@ struct e820map {
}; };
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#define ISA_START_ADDRESS 0xa0000
#define ISA_END_ADDRESS 0x100000
#ifdef __KERNEL__ #ifdef __KERNEL__
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
# include "e820_32.h" # include "e820_32.h"
......
...@@ -26,6 +26,10 @@ extern void e820_reserve_resources(struct resource *code_resource, ...@@ -26,6 +26,10 @@ extern void e820_reserve_resources(struct resource *code_resource,
extern void e820_mark_nosave_regions(void); extern void e820_mark_nosave_regions(void);
extern int e820_any_mapped(unsigned long start, unsigned long end, unsigned type); extern int e820_any_mapped(unsigned long start, unsigned long end, unsigned type);
extern int e820_all_mapped(unsigned long start, unsigned long end, unsigned type); extern int e820_all_mapped(unsigned long start, unsigned long end, unsigned type);
extern int e820_any_non_reserved(unsigned long start, unsigned long end);
extern int is_memory_any_valid(unsigned long start, unsigned long end);
extern int e820_all_non_reserved(unsigned long start, unsigned long end);
extern int is_memory_all_valid(unsigned long start, unsigned long end);
extern unsigned long e820_hole_size(unsigned long start, unsigned long end); extern unsigned long e820_hole_size(unsigned long start, unsigned long end);
extern void e820_setup_gap(void); extern void e820_setup_gap(void);
...@@ -38,6 +42,7 @@ extern struct e820map e820; ...@@ -38,6 +42,7 @@ extern struct e820map e820;
extern unsigned ebda_addr, ebda_size; extern unsigned ebda_addr, ebda_size;
extern unsigned long nodemap_addr, nodemap_size; extern unsigned long nodemap_addr, nodemap_size;
#endif/*!__ASSEMBLY__*/ #endif/*!__ASSEMBLY__*/
#endif/*__E820_HEADER*/ #endif/*__E820_HEADER*/
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