diff for duplicates of <20080425181924.GA6076@elte.hu> diff --git a/a/1.txt b/N1/1.txt index 67b0360..d7e57bf 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -172,3 +172,22 @@ index eb16651..4b96148 100644 -#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) +diff --git a/include/asm-x86/fixmap_64.h b/include/asm-x86/fixmap_64.h +index f3d7685..355d26a 100644 +--- a/include/asm-x86/fixmap_64.h ++++ b/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 ba220a4..060afb2 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -203,6 +203,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" + "diff --git a/include/asm-x86/fixmap_64.h b/include/asm-x86/fixmap_64.h\n" + "index f3d7685..355d26a 100644\n" + "--- a/include/asm-x86/fixmap_64.h\n" + "+++ b/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> -5cf8069c87719b56f78d75102eb11ff30811392035b31db861842f03f55b1be6 +499411b55df4f228fc47560a02e2c0cd5fcd197c8e306dcfe4fdc6277f6bfd2c
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.