linux.git/include/asm-x86/pgtable_64.h, branch master

x86, um: ... and asm-x86 move

2008-10-23T05:55:20+00:00

Signed-off-by: Al Viro 
Signed-off-by: H. Peter Anvin

Merge branches 'x86/alternatives', 'x86/cleanups', 'x86/commandline', 'x86/crashdump', 'x86/debug', 'x86/defconfig', 'x86/doc', 'x86/exports', 'x86/fpu', 'x86/gart', 'x86/idle', 'x86/mm', 'x86/mtrr', 'x86/nmi-watchdog', 'x86/oprofile', 'x86/paravirt', 'x86/reboot', 'x86/sparse-fixes', 'x86/tsc', 'x86/urgent' and 'x86/vmalloc' into x86-v28-for-linus-phase1

2008-10-06T16:17:07+00:00

Merge branch 'x86/header-guards' into x86-v28-for-linus-phase1

2008-10-06T14:15:57+00:00

Conflicts:
	include/asm-x86/dma-mapping.h
	include/asm-x86/gpio.h
	include/asm-x86/idle.h
	include/asm-x86/kvm_host.h
	include/asm-x86/namei.h
	include/asm-x86/uaccess.h

Signed-off-by: Ingo Molnar

x86: unsigned long pte_pfn

2008-09-10T08:00:42+00:00

pte_pfn() has always been of type unsigned long, even on 32-bit PAE;
but in the current tip/next/mm tree it works out to be unsigned long
long on 64-bit, which gives an irritating warning if you try to printk
a pfn with the usual %lx.

Now use the same pte_pfn() function, moved from pgtable-3level.h
to pgtable.h, for all models: as suggested by Jeremy Fitzhardinge.
And pte_page() can well move along with it (remaining a macro to
avoid dependence on mm_types.h).

Signed-off-by: Hugh Dickins 
Acked-by: Jeremy Fitzhardinge 
Signed-off-by: Ingo Molnar

x86-64: fix overlap of modules and fixmap areas

2008-08-15T15:31:50+00:00

Plus add a build time check so this doesn't go unnoticed again.

Signed-off-by: Jan Beulich 
Signed-off-by: Ingo Molnar

Merge branch 'linus' into x86/header-guards

2008-07-26T13:30:40+00:00

Conflicts:

	include/asm-x86/gpio.h
	include/asm-x86/ide.h

Signed-off-by: Ingo Molnar

x86: consolidate header guards

2008-07-22T19:31:34+00:00

This patch is the result of an automatic script that consolidates the
format of all the headers in include/asm-x86/.

The format:

1. No leading underscore. Names with leading underscores are reserved.
2. Pathname components are separated by two underscores. So we can
   distinguish between mm_types.h and mm/types.h.
3. Everything except letters and numbers are turned into single
   underscores.

Signed-off-by: Vegard Nossum

x86: rename PTE_MASK to PTE_PFN_MASK

2008-07-22T08:43:44+00:00

Rusty, in his peevish way, complained that macros defining constants
should have a name which somewhat accurately reflects the actual
purpose of the constant.

Aside from the fact that PTE_MASK gives no clue as to what's actually
being masked, and is misleadingly similar to the functionally entirely
different PMD_MASK, PUD_MASK and PGD_MASK, I don't really see what the
problem is.

But if this patch silences the incessent noise, then it will have
achieved its goal (TODO: write test-case).

Signed-off-by: Jeremy Fitzhardinge 
Cc: Rusty Russell 
Signed-off-by: Ingo Molnar

xen64: early mapping setup

2008-07-16T09:00:07+00:00

Set up the initial pagetables to map the kernel mapping into the
physical mapping space.  This makes __va() usable, since it requires
physical mappings.

Signed-off-by: Jeremy Fitzhardinge 
Cc: Stephen Tweedie 
Cc: Eduardo Habkost 
Cc: Mark McLoughlin 
Signed-off-by: Ingo Molnar

x86, 64-bit: split set_pte_vaddr()

2008-07-08T11:11:09+00:00

We will need to set a pte on l3_user_pgt. Extract set_pte_vaddr_pud()
from set_pte_vaddr(), that will accept the l3 page table as parameter.

This change should be a no-op for existing code.

Signed-off-by: Eduardo Habkost 
Signed-off-by: Mark McLoughlin 
Signed-off-by: Jeremy Fitzhardinge 
Cc: xen-devel 
Cc: Stephen Tweedie 
Cc: Mark McLoughlin 
Signed-off-by: Ingo Molnar