Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 platform changes from Ingo Molnar:
 "This tree includes assorted platform driver updates and a preparatory
  series for a platform with custom DMA remapping semantics (sta2x11 I/O
  hub)."

* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/vsmp: Fix number of CPUs when vsmp is disabled
  keyboard: Use BIOS Keyboard variable to set Numlock
  x86/olpc/xo1/sci: Report RTC wakeup events
  x86/olpc/xo1/sci: Produce wakeup events for buttons and switches
  x86, platform: Initial support for sta2x11 I/O hub
  x86: Introduce CONFIG_X86_DMA_REMAP
  x86-32: Introduce CONFIG_X86_DEV_DMA_OPS

1 files changed, 12 insertions, 6 deletions

diff --git a/arch/x86/boot/main.c b/arch/x86/boot/main.c
index 40358c8905be..cf6083d444f4 100644
--- a/arch/x86/boot/main.c
+++ b/arch/x86/boot/main.c
@@ -57,14 +57,20 @@ static void copy_boot_params(void)
 }
 
 /*
- * Set the keyboard repeat rate to maximum.  Unclear why this
+ * Query the keyboard lock status as given by the BIOS, and
+ * set the keyboard repeat rate to maximum.  Unclear why the latter
  * is done here; this might be possible to kill off as stale code.
  */
-static void keyboard_set_repeat(void)
+static void keyboard_init(void)
 {
-        struct biosregs ireg;
+        struct biosregs ireg, oreg;
         initregs(&ireg);
-        ireg.ax = 0x0305;
+
+        ireg.ah = 0x02;         /* Get keyboard status */
+        intcall(0x16, &ireg, &oreg);
+        boot_params.kbd_status = oreg.al;
+
+        ireg.ax = 0x0305;       /* Set keyboard repeat rate */
         intcall(0x16, &ireg, NULL);
 }
 
@@ -151,8 +157,8 @@ void main(void)
         /* Detect memory layout */
         detect_memory();
 
-        /* Set keyboard repeat rate (why?) */
-        keyboard_set_repeat();
+        /* Set keyboard repeat rate (why?) and query the lock flags */
+        keyboard_init();
 
         /* Query MCA information */
         query_mca();