more untangling

more untangling

[Jeremy Fitzhardinge]

I've done the asm _types.h and page->pgtable moves.  One hiccup is 
kernel/head_64.S uses pgd_index(), which is defined as an asm-compatible 
macro in pgtable.h.  Its a bit warty because it also needs pud_index(), 
which it defines locally (which is an inline in pgtable.h).  Need to 
think about that one...

    J

The following changes since commit beb6943d8df7ce9278282101af4e0f6f7b648451:
  Ingo Molnar (1):
        x86 headers: protect page_32.h via __ASSEMBLY__

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git x86/untangle2

Jeremy Fitzhardinge (2):
      x86: use _types.h headers in asm where available
      x86: move more pagetable-related definitions into pgtable*.h

 arch/x86/boot/compressed/head_32.S          |    2 +-
 arch/x86/boot/compressed/head_64.S          |    4 ++--
 arch/x86/boot/header.S                      |    2 +-
 arch/x86/include/asm/page_32_types.h        |    2 --
 arch/x86/include/asm/page_64_types.h        |    2 --
 arch/x86/include/asm/page_types.h           |    6 ------
 arch/x86/include/asm/pgtable-2level_types.h |    2 ++
 arch/x86/include/asm/pgtable-3level_types.h |    2 ++
 arch/x86/include/asm/pgtable_64_types.h     |    1 +
 arch/x86/include/asm/pgtable_types.h        |    6 ++++++
 arch/x86/kernel/acpi/realmode/wakeup.S      |    4 ++--
 arch/x86/kernel/acpi/wakeup_32.S            |    2 +-
 arch/x86/kernel/acpi/wakeup_64.S            |    4 ++--
 arch/x86/kernel/efi_stub_32.S               |    2 +-
 arch/x86/kernel/entry_32.S                  |    2 +-
 arch/x86/kernel/entry_64.S                  |    2 +-
 arch/x86/kernel/head_32.S                   |    4 ++--
 arch/x86/kernel/relocate_kernel_32.S        |    2 +-
 arch/x86/kernel/relocate_kernel_64.S        |    4 ++--
 arch/x86/kernel/trampoline_32.S             |    2 +-
 arch/x86/kernel/trampoline_64.S             |    4 ++--
 arch/x86/kernel/vmlinux_32.lds.S            |    2 +-
 arch/x86/kernel/vmlinux_64.lds.S            |    2 +-
 arch/x86/lib/getuser.S                      |    2 +-
 arch/x86/power/hibernate_asm_32.S           |    2 +-
 arch/x86/power/hibernate_asm_64.S           |    2 +-
 arch/x86/xen/xen-head.S                     |    2 +-
 27 files changed, 37 insertions(+), 36 deletions(-)

Re: more untangling

[Ingo Molnar]

* Jeremy Fitzhardinge <jeremy@goop.org> wrote:

> I've done the asm _types.h and page->pgtable moves.  One 
> hiccup is kernel/head_64.S uses pgd_index(), which is defined 
> as an asm-compatible macro in pgtable.h.  Its a bit warty 
> because it also needs pud_index(), which it defines locally 
> (which is an inline in pgtable.h).  Need to think about that 
> one...
>
>    J
>
> The following changes since commit beb6943d8df7ce9278282101af4e0f6f7b648451:
>  Ingo Molnar (1):
>        x86 headers: protect page_32.h via __ASSEMBLY__
>
> are available in the git repository at:
>
>  git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git x86/untangle2
>
> Jeremy Fitzhardinge (2):
>      x86: use _types.h headers in asm where available
>      x86: move more pagetable-related definitions into pgtable*.h

Pulled into tip:x86/headers, thanks Jeremy!

	Ingo