The patch titled
paravirt: mmu header movement
has been added to the -mm tree. Its filename is
paravirt-mmu-header-movement.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: paravirt: mmu header movement
From: Zachary Amsden <zach@xxxxxxxxxx>
Move header includes for the nopud / nopmd types to the location of the actual
pte / pgd type definitions. This allows generic 4-level page type code to be
written before the split 2/3 level page table headers are included.
Signed-off-by: Zachary Amsden <zach@xxxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxx>
Cc: Jeremy Fitzhardinge <jeremy@xxxxxxxx>
Cc: Chris Wright <chrisw@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/asm-i386/page.h | 2 ++
include/asm-i386/pgtable-2level.h | 2 --
include/asm-i386/pgtable-3level.h | 2 --
3 files changed, 2 insertions(+), 4 deletions(-)
diff -puN include/asm-i386/page.h~paravirt-mmu-header-movement include/asm-i386/page.h
--- a/include/asm-i386/page.h~paravirt-mmu-header-movement
+++ a/include/asm-i386/page.h
@@ -52,6 +52,7 @@ typedef struct { unsigned long long pgpr
#define pte_val(x) ((x).pte_low | ((unsigned long long)(x).pte_high << 32))
#define __pmd(x) ((pmd_t) { (x) } )
#define HPAGE_SHIFT 21
+#include <asm-generic/pgtable-nopud.h>
#else
typedef struct { unsigned long pte_low; } pte_t;
typedef struct { unsigned long pgd; } pgd_t;
@@ -59,6 +60,7 @@ typedef struct { unsigned long pgprot; }
#define boot_pte_t pte_t /* or would you rather have a typedef */
#define pte_val(x) ((x).pte_low)
#define HPAGE_SHIFT 22
+#include <asm-generic/pgtable-nopmd.h>
#endif
#define PTE_MASK PAGE_MASK
diff -puN include/asm-i386/pgtable-2level.h~paravirt-mmu-header-movement include/asm-i386/pgtable-2level.h
--- a/include/asm-i386/pgtable-2level.h~paravirt-mmu-header-movement
+++ a/include/asm-i386/pgtable-2level.h
@@ -1,8 +1,6 @@
#ifndef _I386_PGTABLE_2LEVEL_H
#define _I386_PGTABLE_2LEVEL_H
-#include <asm-generic/pgtable-nopmd.h>
-
#define pte_ERROR(e) \
printk("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, (e).pte_low)
#define pgd_ERROR(e) \
diff -puN include/asm-i386/pgtable-3level.h~paravirt-mmu-header-movement include/asm-i386/pgtable-3level.h
--- a/include/asm-i386/pgtable-3level.h~paravirt-mmu-header-movement
+++ a/include/asm-i386/pgtable-3level.h
@@ -1,8 +1,6 @@
#ifndef _I386_PGTABLE_3LEVEL_H
#define _I386_PGTABLE_3LEVEL_H
-#include <asm-generic/pgtable-nopud.h>
-
/*
* Intel Physical Address Extension (PAE) Mode - three-level page
* tables on PPro+ CPUs.
_
Patches currently in -mm which might be from zach@xxxxxxxxxx are
paravirt-mmu-header-movement.patch
fix-kunmap_atomics-use-of-kpte_clear_flush.patch
updated-i386-cleanup-apic-code.patch
updated-i386-rework-local-apic-calibration.patch
updated-dynticks-fix-nmi-watchdog.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
