Messages in this thread | | | Date | Mon, 09 Feb 2009 09:25:54 -0800 | From | Jeremy Fitzhardinge <> | Subject | Re: [PATCH] x86, pgtable.h: fix 2-level 32-bit build |
| |
Ingo Molnar wrote: > Please double check the fix below. > > Regarding the page.h include - maybe we should introduce asm/page_types.h just for > the bare essentials? OTOH ... x86 asm/page.h already seems bare essentials. > > Regarding types, each include file should be self-sufficient. >
I did some more work on this last night, resulting in the series below. It introduces a series of *-defs.h headers which define constants and very simple inlines without any complex external dependencies (they depend on either other asm/*-defs.h headers, or basic common headers like linux/types.h).
The following changes since commit fd95fb02f7ac3c96f2a8db4a8f0a04fdc4db5731: Jeremy Fitzhardinge (1): Include linux/mmzone to avoid cyclic dependency
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git x86/untangle
Jeremy Fitzhardinge (9): Revert "Include linux/mmzone to avoid cyclic dependency" Split pgtable.h into pgtable-defs.h and pgtable.h Split pgtable_32.h into pgtable_32.h and pgtable_32-defs.h Split pgtable_64.h into pgtable_64-defs.h and pgtable_64.h Include pgtable_32|64-defs.h in pgtable-defs.h create -defs.h counterparts for page*.h x86: move 2 and 3 level asm-generic defs into page-defs x86: move defs around to allow paravirt.h to just include page-defs.h define pud_flags and pud_large properly to allow non-PAE builds
arch/x86/include/asm/page-defs.h | 155 ++++++++++++++++++++++ arch/x86/include/asm/page.h | 145 +-------------------- arch/x86/include/asm/page_32-defs.h | 92 +++++++++++++ arch/x86/include/asm/page_32.h | 89 +------------ arch/x86/include/asm/page_64-defs.h | 105 +++++++++++++++ arch/x86/include/asm/page_64.h | 101 +-------------- arch/x86/include/asm/paravirt.h | 2 +- arch/x86/include/asm/pgtable-defs.h | 226 ++++++++++++++++++++++++++++++++ arch/x86/include/asm/pgtable.h | 223 +------------------------------ arch/x86/include/asm/pgtable_32-defs.h | 46 +++++++ arch/x86/include/asm/pgtable_32.h | 42 +------ arch/x86/include/asm/pgtable_64-defs.h | 46 +++++++ arch/x86/include/asm/pgtable_64.h | 48 +------- drivers/char/hvc_xen.c | 1 - 14 files changed, 686 insertions(+), 635 deletions(-) create mode 100644 arch/x86/include/asm/page-defs.h create mode 100644 arch/x86/include/asm/page_32-defs.h create mode 100644 arch/x86/include/asm/page_64-defs.h create mode 100644 arch/x86/include/asm/pgtable-defs.h create mode 100644 arch/x86/include/asm/pgtable_32-defs.h create mode 100644 arch/x86/include/asm/pgtable_64-defs.h
J
| |