From: Zachary Amsden <zach@vmware.com>
To: Andrew Morton <akpm@osdl.org>,
Rusty Russell <rusty@rustcorp.com.au>, Andi Kleen <ak@muc.de>,
Jeremy Fitzhardinge <jeremy@goop.org>,
Chris Wright <chrisw@sous-sol.org>,
Virtualization Mailing List <virtualization@lists.osdl.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Zachary Amsden <zach@vmware.com>
Subject: [PATCH 5/5] Mmu header movement.patch
Date: Thu, 19 Oct 2006 17:09:22 -0700 [thread overview]
Message-ID: <200610200009.k9K09M29027582@zach-dev.vmware.com> (raw)
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@vmware.com>
diff -r 8233e2c507d3 include/asm-i386/page.h
--- a/include/asm-i386/page.h Thu Oct 19 03:11:37 2006 -0700
+++ b/include/asm-i386/page.h Thu Oct 19 03:16:36 2006 -0700
@@ -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 -r 8233e2c507d3 include/asm-i386/pgtable-2level.h
--- a/include/asm-i386/pgtable-2level.h Thu Oct 19 03:11:37 2006 -0700
+++ b/include/asm-i386/pgtable-2level.h Thu Oct 19 03:16:36 2006 -0700
@@ -1,7 +1,5 @@
#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)
diff -r 8233e2c507d3 include/asm-i386/pgtable-3level.h
--- a/include/asm-i386/pgtable-3level.h Thu Oct 19 03:11:37 2006 -0700
+++ b/include/asm-i386/pgtable-3level.h Thu Oct 19 03:16:36 2006 -0700
@@ -1,7 +1,5 @@
#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
reply other threads:[~2006-10-20 0:09 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200610200009.k9K09M29027582@zach-dev.vmware.com \
--to=zach@vmware.com \
--cc=ak@muc.de \
--cc=akpm@osdl.org \
--cc=chrisw@sous-sol.org \
--cc=jeremy@goop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rusty@rustcorp.com.au \
--cc=virtualization@lists.osdl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).