Merge branch 'x86/setup' into x86/devel

diff --cc Documentation/x86/x86_64/mm.txt
index 0000000,b89b6d2..efce750
mode 000000,100644..100644
--- /dev/null
--- 2/Documentation/x86/x86_64/mm.txt
+++ b/Documentation/x86/x86_64/mm.txt
@@@ -1,0 -1,29 +1,28 @@@
 -ffffffff80000000 - ffffffff82800000 (=40 MB)   kernel text mapping, from phys 0
 -... unused hole ...
 -ffffffff88000000 - fffffffffff00000 (=1919 MB) module mapping space
+ 
+ <previous description obsolete, deleted>
+ 
+ Virtual memory map with 4 level page tables:
+ 
+ 0000000000000000 - 00007fffffffffff (=47 bits) user space, different per mm
+ hole caused by [48:63] sign extension
+ ffff800000000000 - ffff80ffffffffff (=40 bits) guard hole
+ ffff810000000000 - ffffc0ffffffffff (=46 bits) direct mapping of all phys. memory
+ ffffc10000000000 - ffffc1ffffffffff (=40 bits) hole
+ ffffc20000000000 - ffffe1ffffffffff (=45 bits) vmalloc/ioremap space
+ ffffe20000000000 - ffffe2ffffffffff (=40 bits) virtual memory map (1TB)
+ ... unused hole ...
++ffffffff80000000 - ffffffffa0000000 (=512 MB)  kernel text mapping, from phys 0
++ffffffffa0000000 - fffffffffff00000 (=1536 MB) module mapping space
+ 
+ The direct mapping covers all memory in the system up to the highest
+ memory address (this means in some cases it can also include PCI memory
+ holes).
+ 
+ vmalloc space is lazily synchronized into the different PML4 pages of
+ the processes using the page fault handler, with init_level4_pgt as
+ reference.
+ 
+ Current X86-64 implementations only support 40 bits of address space,
+ but we support up to 46 bits. This expands into MBZ space in the page tables.
+ 
+ -Andi Kleen, Jul 2004

diff --cc arch/x86/Kconfig.debug
index 1836337,14abaa5..38a1533
--- 1/arch/x86/Kconfig.debug
--- 2/arch/x86/Kconfig.debug
+++ b/arch/x86/Kconfig.debug
@@@ -6,20 -6,24 +6,28 @@@ config TRACE_IRQFLAGS_SUPPOR
  source "lib/Kconfig.debug"
  
  config NONPROMISC_DEVMEM
 -      bool "Disable promiscuous /dev/mem"
 +      bool "Filter access to /dev/mem"
        help
 -        The /dev/mem file by default only allows userspace access to PCI
 -        space and the BIOS code and data regions. This is sufficient for
 -        dosemu and X and all common users of /dev/mem. With this config
 -        option, you allow userspace access to all of memory, including
 -        kernel and userspace memory. Accidental access to this is
 -        obviously disasterous, but specific access can be used by people
 -        debugging the kernel.
 +        If this option is left off, you allow userspace access to all
 +        of memory, including kernel and userspace memory. Accidental
 +        access to this is obviously disastrous, but specific access can
 +        be used by people debugging the kernel.
 +
 +        If this option is switched on, the /dev/mem file only allows
 +        userspace access to PCI space and the BIOS code and data regions.
 +        This is sufficient for dosemu and X and all common users of
 +        /dev/mem.
 +
 +        If in doubt, say Y.
  
+ config X86_VERBOSE_BOOTUP
+       bool "Enable verbose x86 bootup info messages"
+       default y
+       help
+         Enables the informational output from the decompression stage
+         (e.g. bzImage) of the boot. If you disable this you will still
+         see errors. Disable this if you want silent bootup.
+ 
  config EARLY_PRINTK
        bool "Early printk" if EMBEDDED
        default y

diff --cc arch/x86/boot/a20.c
Simple merge