Merge branch 'x86/setup' into x86/devel

diff --combined Documentation/x86/x86_64/mm.txt
index efce7509736911434e299d0fe63e344c70d7b1e3,b89b6d2bebfa7b355aeffacc5c7e60e91eb54a86..efce7509736911434e299d0fe63e344c70d7b1e3
--- 1/Documentation/x86_64/mm.txt
--- 2/Documentation/x86/x86_64/mm.txt
+++ b/Documentation/x86/x86_64/mm.txt
@@@ -11,8 -11,9 +11,8 @@@ ffffc10000000000 - ffffc1ffffffffff (=4
  ffffc20000000000 - ffffe1ffffffffff (=45 bits) vmalloc/ioremap space
  ffffe20000000000 - ffffe2ffffffffff (=40 bits) virtual memory map (1TB)
  ... unused hole ...
 -ffffffff80000000 - ffffffff82800000 (=40 MB)   kernel text mapping, from phys 0
 -... unused hole ...
 -ffffffff88000000 - fffffffffff00000 (=1919 MB) module mapping space
 +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

diff --combined arch/x86/Kconfig.debug
index 18363374d51a9a57b39b6fb8d3f87a054b4b4aa5,14abaa51922157b6c2ec0a932e9d7edd6184d85c..38a15333f725b99b9a0c1a8dd5f34b7f9c86e9b5
--- 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 --combined arch/x86/boot/a20.c
index e01aafd03bdec42086147d4cb00e18a342a237eb,ef6e142a6b40138c3009795e73ad5da1bcbb0f7f..4063d630deff23cf2974e9839bc714de42b01f4c
--- 1/arch/x86/boot/a20.c
--- 2/arch/x86/boot/a20.c
+++ b/arch/x86/boot/a20.c
@@@ -1,7 -1,7 +1,7 @@@
  /* -*- linux-c -*- ------------------------------------------------------- *
   *
   *   Copyright (C) 1991, 1992 Linus Torvalds
-  *   Copyright 2007 rPath, Inc. - All Rights Reserved
+  *   Copyright 2007-2008 rPath, Inc. - All Rights Reserved
   *
   *   This file is part of the Linux kernel, and is made available under
   *   the terms of the GNU General Public License version 2.
@@@ -95,6 -95,9 +95,9 @@@ static void enable_a20_kbc(void
  
        outb(0xdf, 0x60);       /* A20 on */
        empty_8042();
+ 
+       outb(0xff, 0x64);       /* Null command, but UHCI wants it */
+       empty_8042();
  }
  
  static void enable_a20_fast(void)
@@@ -115,6 -118,8 +118,6 @@@
  
  int enable_a20(void)
  {
 -      int loops = A20_ENABLE_LOOPS;
 -
  #if defined(CONFIG_X86_ELAN)
        /* Elan croaks if we try to touch the KBC */
        enable_a20_fast();
@@@ -126,7 -131,6 +129,7 @@@
        enable_a20_kbc();
        return 0;
  #else
 +       int loops = A20_ENABLE_LOOPS;
        while (loops--) {
                /* First, check to see if A20 is already enabled
                   (legacy free, etc.) */