Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (28 commits)
  ACPI: thermal: add DMI hooks to handle AOpen's broken Award BIOS
  ACPI: thermal: create "thermal.act=" to disable or override active trip point
  ACPI: thermal: create "thermal.nocrt" to disable critical actions
  ACPI: thermal: create "thermal.psv=" to override passive trip points
  ACPI: thermal: expose "thermal.tzp=" to set global polling frequency
  ACPI: thermal: create "thermal.off=1" to disable ACPI thermal support
  ACPI: thinkpad-acpi: fix sysfs paths in documentation
  ACPI: static
  ACPI EC: remove potential deadlock from EC
  ACPI: dock: Send key=value pair instead of plain value
  ACPI: bay: send envp with uevent - fix
  acpi-cpufreq: Fix some x86/x86-64 acpi-cpufreq driver issues
  ACPI: fix "Time Problems with 2.6.23-rc1-gf695baf2"
  ACPI: thinkpad-acpi: change thinkpad-acpi input default and kconfig help
  ACPI: EC: fix run-together printk lines
  ACPI: sbs: remove dead code
  ACPI: EC: acpi_ec_remove(): fix use-after-free
  ACPI: EC: Switch from boot_ec as soon as we find its desc in DSDT.
  ACPI: EC: fix build warning
  ACPI: EC: If ECDT is not found, look up EC in DSDT.
  ...

diff --git a/arch/i386/pci/mmconfig.c b/arch/i386/pci/mmconfig.c
index 0d46b7a..1bf5816 100644 (file)
--- a/arch/i386/pci/mmconfig.c
+++ b/arch/i386/pci/mmconfig.c
@@ -115,13 +115,13 @@ static int pci_mmcfg_write(unsigned int seg, unsigned int bus,
 
        switch (len) {
        case 1:
-               mmio_config_writeb(mmcfg_virt_addr, value);
+               mmio_config_writeb(mmcfg_virt_addr + reg, value);
                break;
        case 2:
-               mmio_config_writew(mmcfg_virt_addr, value);
+               mmio_config_writew(mmcfg_virt_addr + reg, value);
                break;
        case 4:
-               mmio_config_writel(mmcfg_virt_addr, value);
+               mmio_config_writel(mmcfg_virt_addr + reg, value);
                break;
        }
        spin_unlock_irqrestore(&pci_config_lock, flags);

diff --git a/arch/x86_64/lib/memcpy.S b/arch/x86_64/lib/memcpy.S
index 0ea0ddc..c22981f 100644 (file)
--- a/arch/x86_64/lib/memcpy.S
+++ b/arch/x86_64/lib/memcpy.S
@@ -124,6 +124,8 @@ ENDPROC(__memcpy)
        .quad memcpy
        .quad 1b
        .byte X86_FEATURE_REP_GOOD
-       .byte .Lfinal - memcpy
+       /* Replace only beginning, memcpy is used to apply alternatives, so it
+        * is silly to overwrite itself with nops - reboot is only outcome... */
+       .byte 2b - 1b
        .byte 2b - 1b
        .previous