Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=306c142f99caef5a30a0d61a39a956c069941b63 Commit: 306c142f99caef5a30a0d61a39a956c069941b63 Parent: e91a3b4353577c7d38b77dd1293fc3d0a173e8e6 Author: Ingo Molnar <[EMAIL PROTECTED]> AuthorDate: Wed Jan 30 13:33:08 2008 +0100 Committer: Ingo Molnar <[EMAIL PROTECTED]> CommitDate: Wed Jan 30 13:33:08 2008 +0100
x86: pat: e820 cleanup NOP change. Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]> Signed-off-by: Thomas Gleixner <[EMAIL PROTECTED]> --- arch/x86/mm/ioremap_64.c | 4 +--- include/asm-x86/e820.h | 3 +++ include/asm-x86/e820_64.h | 5 +++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/arch/x86/mm/ioremap_64.c b/arch/x86/mm/ioremap_64.c index b03db4c..6fbd3c7 100644 --- a/arch/x86/mm/ioremap_64.c +++ b/arch/x86/mm/ioremap_64.c @@ -19,6 +19,7 @@ #include <asm/tlbflush.h> #include <asm/cacheflush.h> #include <asm/proto.h> +#include <asm/e820.h> unsigned long __phys_addr(unsigned long x) { @@ -28,9 +29,6 @@ unsigned long __phys_addr(unsigned long x) } 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 * conflicts. diff --git a/include/asm-x86/e820.h b/include/asm-x86/e820.h index 3e214f3..f96f185 100644 --- a/include/asm-x86/e820.h +++ b/include/asm-x86/e820.h @@ -22,6 +22,9 @@ struct e820map { }; #endif /* __ASSEMBLY__ */ +#define ISA_START_ADDRESS 0xa0000 +#define ISA_END_ADDRESS 0x100000 + #ifdef __KERNEL__ #ifdef CONFIG_X86_32 # include "e820_32.h" diff --git a/include/asm-x86/e820_64.h b/include/asm-x86/e820_64.h index 1c7ba88..8cba49d 100644 --- a/include/asm-x86/e820_64.h +++ b/include/asm-x86/e820_64.h @@ -26,6 +26,10 @@ extern void e820_reserve_resources(struct resource *code_resource, extern void e820_mark_nosave_regions(void); 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_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 void e820_setup_gap(void); @@ -38,6 +42,7 @@ extern struct e820map e820; extern unsigned ebda_addr, ebda_size; extern unsigned long nodemap_addr, nodemap_size; + #endif/*!__ASSEMBLY__*/ #endif/*__E820_HEADER*/ - To unsubscribe from this list: send the line "unsubscribe git-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html