* Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> wrote: > On Fri, 25 Apr 2008, Ingo Molnar wrote: > > > > hm, right now we've got a debug protection in set_fixmap() to make > > sure it's only ever called once. So it's going to be a noisy bootup. > > (but it's a warning only) The patch below removes that. > > No, I think the warning is good, I should have done some kind of > clear_fixmap() after doing the mmap. yeah - then you need the patch below that makes clear_fixmap() available on 64-bit as well. Ingo ---------------> Subject: x86: make clear_fixmap() available on 64-bit as well From: Ingo Molnar <mingo@xxxxxxx> Date: Fri Apr 25 18:25:25 CEST 2008 Signed-off-by: Ingo Molnar <mingo@xxxxxxx> --- include/asm-x86/fixmap.h | 8 ++++++++ include/asm-x86/fixmap_32.h | 7 ++----- include/asm-x86/fixmap_64.h | 4 ++-- 3 files changed, 12 insertions(+), 7 deletions(-) Index: linux/include/asm-x86/fixmap.h =================================================================== --- linux.orig/include/asm-x86/fixmap.h +++ linux/include/asm-x86/fixmap.h @@ -1,5 +1,13 @@ +#ifndef _ASM_FIXMAP_H +#define _ASM_FIXMAP_H + #ifdef CONFIG_X86_32 # include "fixmap_32.h" #else # include "fixmap_64.h" #endif + +#define clear_fixmap(idx) \ + __set_fixmap(idx, 0, __pgprot(0)) + +#endif Index: linux/include/asm-x86/fixmap_32.h =================================================================== --- linux.orig/include/asm-x86/fixmap_32.h +++ linux/include/asm-x86/fixmap_32.h @@ -10,8 +10,8 @@ * Support of BIGMEM added by Gerhard Wichert, Siemens AG, July 1999 */ -#ifndef _ASM_FIXMAP_H -#define _ASM_FIXMAP_H +#ifndef _ASM_FIXMAP_32_H +#define _ASM_FIXMAP_32_H /* used by vmalloc.c, vsyscall.lds.S. @@ -121,9 +121,6 @@ extern void reserve_top_address(unsigned #define set_fixmap_nocache(idx, phys) \ __set_fixmap(idx, phys, PAGE_KERNEL_NOCACHE) -#define clear_fixmap(idx) \ - __set_fixmap(idx, 0, __pgprot(0)) - #define FIXADDR_TOP ((unsigned long)__FIXADDR_TOP) #define __FIXADDR_SIZE (__end_of_permanent_fixed_addresses << PAGE_SHIFT) Index: linux/include/asm-x86/fixmap_64.h =================================================================== --- linux.orig/include/asm-x86/fixmap_64.h +++ linux/include/asm-x86/fixmap_64.h @@ -8,8 +8,8 @@ * Copyright (C) 1998 Ingo Molnar */ -#ifndef _ASM_FIXMAP_H -#define _ASM_FIXMAP_H +#ifndef _ASM_FIXMAP_64_H +#define _ASM_FIXMAP_64_H #include <linux/kernel.h> #include <asm/apicdef.h> -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
