[PATCH] x86 headers: remove duplicate pud_large() definition

[Ingo Molnar]

* Ingo Molnar <mingo@xxxxxxx> wrote:

> 
> * Jeremy Fitzhardinge <jeremy@xxxxxxxx> wrote:
> 
> > I cleaned up the untangle series.
> >
> > The following changes since commit 9049a11de73d3ecc623f1903100d099f82ede56c:
> >  Jeremy Fitzhardinge (1):
> >        Merge commit 'remotes/tip/x86/paravirt' into x86/untangle2
> >
> > are available in the git repository at:
> >
> >  git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git x86/untangle2
> >
> > Jeremy Fitzhardinge (10):
> >      x86: rename *-defs.h to *-_types.h for consistency
> >      Split pgtable.h into pgtable_types.h and pgtable.h
> >      x86: Split pgtable_32.h into pgtable_32.h and pgtable_32_types.h
> >      x86: Split pgtable_64.h into pgtable_64_types.h and pgtable_64.h
> >      x86: Include pgtable_32|64_types.h in pgtable_types.h
> >      x86: create _types.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_types.h
> >      x86: define pud_flags and pud_large properly to allow non-PAE builds
> >      x86: move pte types into pgtable*.h
> >
> > arch/x86/include/asm/page.h                        |  168 +----------
> > arch/x86/include/asm/page_32.h                     |   89 +------
> > arch/x86/include/asm/page_32_types.h               |   62 ++++
> > arch/x86/include/asm/page_64.h                     |  101 +------
> > arch/x86/include/asm/page_64.h.rej                 |  114 +++++++
> > arch/x86/include/asm/page_64_types.h               |   91 ++++++
> > arch/x86/include/asm/page_types.h                  |   64 ++++
> > arch/x86/include/asm/paravirt.h                    |    2 +-
> > arch/x86/include/asm/pgtable-2level-defs.h         |   20 --
> > arch/x86/include/asm/pgtable-2level_types.h        |   35 +++
> > ...gtable-3level-defs.h => pgtable-3level_types.h} |   18 ++
> > arch/x86/include/asm/pgtable.h                     |  322 ++++----------------
> > arch/x86/include/asm/pgtable_32.h                  |   42 +---
> > arch/x86/include/asm/pgtable_32_types.h            |   46 +++
> > arch/x86/include/asm/pgtable_64.h                  |   48 +---
> > arch/x86/include/asm/pgtable_64_types.h            |   62 ++++
> > arch/x86/include/asm/pgtable_types.h               |  321 +++++++++++++++++++
> > arch/x86/include/asm/processor.h                   |    1 +
> > 18 files changed, 891 insertions(+), 715 deletions(-)
> > create mode 100644 arch/x86/include/asm/page_32_types.h
> > create mode 100644 arch/x86/include/asm/page_64.h.rej
> > create mode 100644 arch/x86/include/asm/page_64_types.h
> > create mode 100644 arch/x86/include/asm/page_types.h
> > delete mode 100644 arch/x86/include/asm/pgtable-2level-defs.h
> > create mode 100644 arch/x86/include/asm/pgtable-2level_types.h
> > rename arch/x86/include/asm/{pgtable-3level-defs.h => pgtable-3level_types.h} (67%)
> > create mode 100644 arch/x86/include/asm/pgtable_32_types.h
> > create mode 100644 arch/x86/include/asm/pgtable_64_types.h
> > create mode 100644 arch/x86/include/asm/pgtable_types.h
> 
> Pulled into tip:x86/headers, thanks Jeremy!

btw., i had to do these conflict resolutions:

    Conflicts:
        arch/x86/include/asm/page.h
        arch/x86/include/asm/pgtable.h
        arch/x86/mach-voyager/voyager_smp.c
        arch/x86/mm/fault.c

and this in kmemcheck:

    Merge branch 'x86/headers' into kmemcheck
    
    Conflicts:
        arch/x86/include/asm/pgtable.h
    
    Merged into:
    
        arch/x86/include/asm/pgtable_types.h
    
Plus the fixlet below.

	Ingo

------------------------->