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

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, cpufeature: Unbreak compile with gcc 3.x
  x86, pat: Fix memory leak in free_memtype
  x86, k8: Fix section mismatch for powernowk8_exit()
  lib/atomic64_test: fix missing include of linux/kernel.h
  x86: remove last traces of quicklist usage
  x86, setup: Phoenix BIOS fixup is needed on Dell Inspiron Mini 1012
  x86: "nosmp" command line option should force the system into UP mode
  arch/x86/pci: use kasprintf
  x86, apic: ack all pending irqs when crashed/on kexec

diff --combined arch/x86/pci/acpi.c
index 9dcf43d7d0c091e20550c7e393e5f055307e3d08,7c0ad634694a17cc923a3f12f1a98a04ca5a6ba5..2ec04c424a6229f7d830e78fb49f5532b804d212
--- 1/arch/x86/pci/acpi.c
--- 2/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
@@@ -207,10 -207,9 +207,9 @@@ get_current_resources(struct acpi_devic
        if (!info.res)
                goto res_alloc_fail;
  
-       info.name = kmalloc(16, GFP_KERNEL);
+       info.name = kasprintf(GFP_KERNEL, "PCI Bus %04x:%02x", domain, busnum);
        if (!info.name)
                goto name_alloc_fail;
-       sprintf(info.name, "PCI Bus %04x:%02x", domain, busnum);
  
        info.res_num = 0;
        acpi_walk_resources(device->handle, METHOD_NAME__CRS, setup_resource,
@@@ -224,11 -223,8 +223,11 @@@ res_alloc_fail
        return;
  }
  
 -struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_device *device, int domain, int busnum)
 +struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_pci_root *root)
  {
 +      struct acpi_device *device = root->device;
 +      int domain = root->segment;
 +      int busnum = root->secondary.start;
        struct pci_bus *bus;
        struct pci_sysdata *sd;
        int node;