Pull novell-bugzilla-156426 into release branch

Conflicts:

	arch/i386/kernel/acpi/boot.c

diff --combined arch/i386/kernel/acpi/boot.c
index 7ff6f9d,d0980c7..5ccbf58
--- 1/arch/i386/kernel/acpi/boot.c
--- 2/arch/i386/kernel/acpi/boot.c
+++ b/arch/i386/kernel/acpi/boot.c
@@@ -215,7 -215,7 +215,7 @@@ static int __init acpi_parse_madt(unsig
  {
        struct acpi_table_madt *madt = NULL;
  
-       if (!phys_addr || !size)
+       if (!phys_addr || !size || !cpu_has_apic)
                return -EINVAL;
  
        madt = (struct acpi_table_madt *)__acpi_map_table(phys_addr, size);
@@@ -621,9 -621,9 +621,9 @@@ extern u32 pmtmr_ioport
  
  static int __init acpi_parse_fadt(unsigned long phys, unsigned long size)
  {
 -      struct fadt_descriptor_rev2 *fadt = NULL;
 +      struct fadt_descriptor *fadt = NULL;
  
 -      fadt = (struct fadt_descriptor_rev2 *)__acpi_map_table(phys, size);
 +      fadt = (struct fadt_descriptor *)__acpi_map_table(phys, size);
        if (!fadt) {
                printk(KERN_WARNING PREFIX "Unable to map FADT\n");
                return 0;
@@@ -693,9 -693,6 +693,9 @@@ static int __init acpi_parse_madt_lapic
  {
        int count;
  
 +      if (!cpu_has_apic)
 +              return -ENODEV;
 +
        /* 
         * Note that the LAPIC address is obtained from the MADT (32-bit value)
         * and (optionally) overriden by a LAPIC_ADDR_OVR entry (64-bit value).
@@@ -754,7 -751,7 +754,7 @@@ static int __init acpi_parse_madt_ioapi
                return -ENODEV;
        }
  
-       if (!cpu_has_apic)
+       if (!cpu_has_apic) 
                return -ENODEV;
  
        /*