]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
projects / linux-2.6-omap-h63xx.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: d244118 3cfba08)
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 23 Oct 2008 19:38:39 +0000 (12:38 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 23 Oct 2008 19:38:39 +0000 (12:38 -0700)
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: fix section mismatch warning - apic_x2apic_phys
  x86: fix section mismatch warning - apic_x2apic_cluster
  x86: fix section mismatch warning - apic_x2apic_uv_x
  x86: fix section mismatch warning - apic_physflat
  x86: fix section mismatch warning - apic_flat
  x86: memtest fix use of reserve_early()
  x86 syscall.h: fix argument order
  x86/tlb_uv: remove strange mc146818rtc include
  x86: remove redundant KERN_DEBUG on pr_debug
  x86: do_boot_cpu - check if we have ESR register
  x86: MAINTAINERS change for AMD microcode patch loader
  x86/proc: fix /proc/cpuinfo cpu offline bug
  x86: call dmi-quirks for HP Laptops after early-quirks are executed
  x86, kexec: fix hang on i386 when panic occurs while console_sem is held
  MCE: Don't run 32bit machine checks with interrupts on
  x86: SB600: skip IRQ0 override if it is not routed to INT2 of IOAPIC
  x86: make variables static

1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history
arch/x86/include/asm/syscall.h patch | diff1 | diff2 | blob | history
arch/x86/kernel/acpi/boot.c patch | diff1 | diff2 | blob | history

diff --combined MAINTAINERS
index 277451a52695843c9c572d915a6ca680718e7ced,b0244fb59fe5727b4fd6575b203c3c7ee19cdf4f..16202c8ac68f06bf2dfcb387aa2ee91c5e9bc4f6
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -378,8 -378,9 +378,9 @@@ T: git://git.kernel.org/pub/scm/linux/k
  S:    Supported
  
  AMD MICROCODE UPDATE SUPPORT
- P:      Peter Oruba
- M:      peter.oruba@amd.com
+ P:      Andreas Herrmann
+ M:      andeas.herrmann3@amd.com
+ L:      amd64-microcode@amd64.org
  S:      Supported
  
  AMS (Apple Motion Sensor) DRIVER
@@@ -1053,12 -1054,6 +1054,12 @@@ L:    cbe-oss-dev@ozlabs.or
  W:    http://www.ibm.com/developerworks/power/cell/
  S:    Supported
  
 +CERTIFIED WIRELESS USB (WUSB) SUBSYSTEM:
 +P:    David Vrabel
 +M:    david.vrabel@csr.com
 +L:    linux-usb@vger.kernel.org
 +S:    Supported
 +
  CFAG12864B LCD DRIVER
  P:    Miguel Ojeda Sandonis
  M:    miguel.ojeda.sandonis@gmail.com
@@@ -1433,8 -1428,8 +1434,8 @@@ M:      rdunlap@xenotime.ne
  S:    Maintained
  
  DOCKING STATION DRIVER
 -P:    Kristen Carlson Accardi
 -M:    kristen.c.accardi@intel.com
 +P:    Shaohua Li
 +M:    shaohua.li@intel.com
  L:    linux-acpi@vger.kernel.org
  S:    Supported
  
@@@ -2109,12 -2104,6 +2110,12 @@@ L:    linux-ide@vger.kernel.or
  L:    linux-scsi@vger.kernel.org
  S:    Orphan
  
 +IDLE-I7300
 +P:    Andy Henroid
 +M:    andrew.d.henroid@intel.com
 +L:    linux-pm@lists.linux-foundation.org
 +S:    Supported
 +
  IEEE 1394 SUBSYSTEM (drivers/ieee1394)
  P:    Ben Collins
  M:    ben.collins@ubuntu.com
@@@ -2188,13 -2177,6 +2189,13 @@@ M:    maciej.sosnowski@intel.co
  L:    linux-kernel@vger.kernel.org
  S:    Supported
  
 +INTEL IOMMU (VT-d)
 +P:    David Woodhouse
 +M:    dwmw2@infradead.org
 +L:    iommu@lists.linux-foundation.org
 +T:    git://git.infradead.org/iommu-2.6.git
 +S:    Supported
 +
  INTEL IOP-ADMA DMA DRIVER
  P:    Dan Williams
  M:    dan.j.williams@intel.com
@@@ -2947,9 -2929,9 +2948,9 @@@ S:      Maintaine
  
  NETEFFECT IWARP RNIC DRIVER (IW_NES)
  P:    Faisal Latif
 -M:    flatif@neteffect.com
 +M:    faisal.latif@intel.com
  P:    Chien Tung
 -M:    ctung@neteffect.com
 +M:    chien.tin.tung@intel.com
  L:    general@lists.openfabrics.org
  W:    http://www.neteffect.com
  S:    Supported
@@@ -3192,11 -3174,6 +3193,11 @@@ M:    olof@lixom.ne
  L:    i2c@lm-sensors.org
  S:    Maintained
  
 +PANASONIC LAPTOP ACPI EXTRAS DRIVER
 +P:    Harald Welte
 +M:    laforge@gnumonks.org
 +S:    Maintained
 +
  PANASONIC MN10300/AM33 PORT
  P:    David Howells
  M:    dhowells@redhat.com
@@@ -3268,6 -3245,11 +3269,6 @@@ L:     linux-pci@vger.kernel.or
  T:    git kernel.org:/pub/scm/linux/kernel/git/jbarnes/pci-2.6.git
  S:    Supported
  
 -PCI HOTPLUG CORE
 -P:    Kristen Carlson Accardi
 -M:    kristen.c.accardi@intel.com
 -S:    Supported
 -
  PCIE HOTPLUG DRIVER
  P:    Kristen Carlson Accardi
  M:    kristen.c.accardi@intel.com
@@@ -4210,12 -4192,6 +4211,12 @@@ L:    sparclinux@vger.kernel.or
  T:    git kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6.git
  S:    Maintained
  
 +ULTRA-WIDEBAND (UWB) SUBSYSTEM:
 +P:    David Vrabel
 +M:    david.vrabel@csr.com
 +L:    linux-usb@vger.kernel.org
 +S:    Supported
 +
  UNIFORM CDROM DRIVER
  P:    Jens Axboe
  M:    axboe@kernel.dk
@@@ -4641,11 -4617,6 +4642,11 @@@ M:    zaga@fly.cc.fer.h
  L:    linux-scsi@vger.kernel.org
  S:    Maintained
  
 +WIMEDIA LLC PROTOCOL (WLP) SUBSYSTEM
 +P:    David Vrabel
 +M:    david.vrabel@csr.com
 +S:    Maintained
 +
  WISTRON LAPTOP BUTTON DRIVER
  P:    Miloslav Trmac
  M:    mitr@volny.cz
diff --combined arch/x86/include/asm/syscall.h
index 1d88f6957d3967cf456cfad166990eb2d8dda8e0,ec2a95e68e4249fc705ddb60ad1f2e34fff9aba0..d82f39bb7905e8f14d3cbd1dc0365ba98f03eea6
--- 1/arch/x86/include/asm/syscall.h
--- 2/include/asm-x86/syscall.h
+++ b/arch/x86/include/asm/syscall.h
@@@ -10,8 -10,8 +10,8 @@@
   * See asm-generic/syscall.h for descriptions of what we must do here.
   */
  
 -#ifndef _ASM_SYSCALL_H
 -#define _ASM_SYSCALL_H        1
 +#ifndef _ASM_X86_SYSCALL_H
 +#define _ASM_X86_SYSCALL_H
  
  #include <linux/sched.h>
  #include <linux/err.h>
@@@ -93,26 -93,26 +93,26 @@@ static inline void syscall_get_argument
  {
  # ifdef CONFIG_IA32_EMULATION
        if (task_thread_info(task)->status & TS_COMPAT)
-               switch (i + n) {
-               case 6:
+               switch (i) {
+               case 0:
                        if (!n--) break;
-                       *args++ = regs->bp;
-               case 5:
+                       *args++ = regs->bx;
+               case 1:
                        if (!n--) break;
-                       *args++ = regs->di;
-               case 4:
+                       *args++ = regs->cx;
+               case 2:
                        if (!n--) break;
-                       *args++ = regs->si;
+                       *args++ = regs->dx;
                case 3:
                        if (!n--) break;
-                       *args++ = regs->dx;
-               case 2:
+                       *args++ = regs->si;
+               case 4:
                        if (!n--) break;
-                       *args++ = regs->cx;
-               case 1:
+                       *args++ = regs->di;
+               case 5:
                        if (!n--) break;
-                       *args++ = regs->bx;
-               case 0:
+                       *args++ = regs->bp;
+               case 6:
                        if (!n--) break;
                default:
                        BUG();
@@@ -120,26 -120,26 +120,26 @@@
                }
        else
  # endif
-               switch (i + n) {
-               case 6:
+               switch (i) {
+               case 0:
                        if (!n--) break;
-                       *args++ = regs->r9;
-               case 5:
+                       *args++ = regs->di;
+               case 1:
                        if (!n--) break;
-                       *args++ = regs->r8;
-               case 4:
+                       *args++ = regs->si;
+               case 2:
                        if (!n--) break;
-                       *args++ = regs->r10;
+                       *args++ = regs->dx;
                case 3:
                        if (!n--) break;
-                       *args++ = regs->dx;
-               case 2:
+                       *args++ = regs->r10;
+               case 4:
                        if (!n--) break;
-                       *args++ = regs->si;
-               case 1:
+                       *args++ = regs->r8;
+               case 5:
                        if (!n--) break;
-                       *args++ = regs->di;
-               case 0:
+                       *args++ = regs->r9;
+               case 6:
                        if (!n--) break;
                default:
                        BUG();
@@@ -154,58 -154,60 +154,60 @@@ static inline void syscall_set_argument
  {
  # ifdef CONFIG_IA32_EMULATION
        if (task_thread_info(task)->status & TS_COMPAT)
-               switch (i + n) {
-               case 6:
+               switch (i) {
+               case 0:
                        if (!n--) break;
-                       regs->bp = *args++;
-               case 5:
+                       regs->bx = *args++;
+               case 1:
                        if (!n--) break;
-                       regs->di = *args++;
-               case 4:
+                       regs->cx = *args++;
+               case 2:
                        if (!n--) break;
-                       regs->si = *args++;
+                       regs->dx = *args++;
                case 3:
                        if (!n--) break;
-                       regs->dx = *args++;
-               case 2:
+                       regs->si = *args++;
+               case 4:
                        if (!n--) break;
-                       regs->cx = *args++;
-               case 1:
+                       regs->di = *args++;
+               case 5:
                        if (!n--) break;
-                       regs->bx = *args++;
-               case 0:
+                       regs->bp = *args++;
+               case 6:
                        if (!n--) break;
                default:
                        BUG();
+                       break;
                }
        else
  # endif
-               switch (i + n) {
-               case 6:
+               switch (i) {
+               case 0:
                        if (!n--) break;
-                       regs->r9 = *args++;
-               case 5:
+                       regs->di = *args++;
+               case 1:
                        if (!n--) break;
-                       regs->r8 = *args++;
-               case 4:
+                       regs->si = *args++;
+               case 2:
                        if (!n--) break;
-                       regs->r10 = *args++;
+                       regs->dx = *args++;
                case 3:
                        if (!n--) break;
-                       regs->dx = *args++;
-               case 2:
+                       regs->r10 = *args++;
+               case 4:
                        if (!n--) break;
-                       regs->si = *args++;
-               case 1:
+                       regs->r8 = *args++;
+               case 5:
                        if (!n--) break;
-                       regs->di = *args++;
-               case 0:
+                       regs->r9 = *args++;
+               case 6:
                        if (!n--) break;
                default:
                        BUG();
+                       break;
                }
  }
  
  #endif        /* CONFIG_X86_32 */
  
 -#endif        /* _ASM_SYSCALL_H */
 +#endif        /* _ASM_X86_SYSCALL_H */
diff --combined arch/x86/kernel/acpi/boot.c
index 53b01a1ae10c8fe04e2a926ad1209473c71b487b,dc3eac353db237d29c51cb6ec2d6fd0bdd9f8cbf..8c1f76abae9eac1b28d3a90abb26d6fb39fb8496
--- 1/arch/x86/kernel/acpi/boot.c
--- 2/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@@ -153,13 -153,12 +153,13 @@@ char *__init __acpi_map_table(unsigned 
  }
  
  #ifdef CONFIG_PCI_MMCONFIG
 +
 +static int acpi_mcfg_64bit_base_addr __initdata = FALSE;
 +
  /* The physical address of the MMCONFIG aperture.  Set from ACPI tables. */
  struct acpi_mcfg_allocation *pci_mmcfg_config;
  int pci_mmcfg_config_num;
  
 -static int acpi_mcfg_64bit_base_addr __initdata = FALSE;
 -
  static int __init acpi_mcfg_oem_check(struct acpi_table_mcfg *mcfg)
  {
        if (!strcmp(mcfg->header.oem_id, "SGI"))
@@@ -1137,7 -1136,7 +1137,7 @@@ int mp_register_gsi(u32 gsi, int trigge
                return gsi;
        }
        if (test_bit(ioapic_pin, mp_ioapic_routing[ioapic].pin_programmed)) {
-               pr_debug(KERN_DEBUG "Pin %d-%d already programmed\n",
+               pr_debug("Pin %d-%d already programmed\n",
                         mp_ioapic_routing[ioapic].apic_id, ioapic_pin);
  #ifdef CONFIG_X86_32
                return (gsi < IRQ_COMPRESSION_START ? gsi : gsi_to_irq[gsi]);
@@@ -1599,6 -1598,11 +1599,11 @@@ static struct dmi_system_id __initdata 
                     DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 360"),
                     },
         },
+       {}
+ };
+ 
+ /* second table for DMI checks that should run after early-quirks */
+ static struct dmi_system_id __initdata acpi_dmi_table_late[] = {
        /*
         * HP laptops which use a DSDT reporting as HP/SB400/10000,
         * which includes some code which overrides all temperature
@@@ -1727,6 -1731,9 +1732,9 @@@ int __init early_acpi_boot_init(void
  
  int __init acpi_boot_init(void)
  {
+       /* those are executed after early-quirks are executed */
+       dmi_check_system(acpi_dmi_table_late);
+ 
        /*
         * If acpi_disabled, bail out
         * One exception: acpi=ht continues far enough to enumerate LAPICs
Unnamed repository; edit this file 'description' to name the repository.