diff for duplicates of <20080425164259.GA19962@elte.hu> diff --git a/a/1.txt b/N1/1.txt index d913ce5..2ef2fdb 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -66,3 +66,22 @@ Index: linux/include/asm-x86/fixmap_32.h -#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> diff --git a/a/content_digest b/N1/content_digest index 1cc1e31..c72e559 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -97,6 +97,25 @@ " \t__set_fixmap(idx, phys, PAGE_KERNEL_NOCACHE)\n" " \n" "-#define clear_fixmap(idx)\t\t\t\\\n" - "-\t__set_fixmap(idx, 0, __pgprot(0))" + "-\t__set_fixmap(idx, 0, __pgprot(0))\n" + "-\n" + " #define FIXADDR_TOP\t((unsigned long)__FIXADDR_TOP)\n" + " \n" + " #define __FIXADDR_SIZE\t(__end_of_permanent_fixed_addresses << PAGE_SHIFT)\n" + "Index: linux/include/asm-x86/fixmap_64.h\n" + "===================================================================\n" + "--- linux.orig/include/asm-x86/fixmap_64.h\n" + "+++ linux/include/asm-x86/fixmap_64.h\n" + "@@ -8,8 +8,8 @@\n" + " * Copyright (C) 1998 Ingo Molnar\n" + " */\n" + " \n" + "-#ifndef _ASM_FIXMAP_H\n" + "-#define _ASM_FIXMAP_H\n" + "+#ifndef _ASM_FIXMAP_64_H\n" + "+#define _ASM_FIXMAP_64_H\n" + " \n" + " #include <linux/kernel.h>\n" + #include <asm/apicdef.h> -85e888836ea21506c6369e41ab1e7a97507092347dac42338cf281fa0fe13371 +0986bb3dff84c93360a45729b17690fbf11fa0b09c75751b3b150d7c0cbd3291
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.