From: Len Brown Date: Thu, 8 Sep 2005 05:45:47 +0000 (-0400) Subject: Merge linux-2.6 with linux-acpi-2.6 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=64e47488c913ac704d465a6af86a26786d1412a5;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git Merge linux-2.6 with linux-acpi-2.6 --- 64e47488c913ac704d465a6af86a26786d1412a5 diff --cc arch/i386/mach-es7000/es7000plat.c index f549c0efdb9f,2000bdca2fc2..dc6660511b07 --- a/arch/i386/mach-es7000/es7000plat.c +++ b/arch/i386/mach-es7000/es7000plat.c @@@ -73,8 -73,25 +73,25 @@@ es7000_rename_gsi(int ioapic, int gsi return gsi; } -#endif // (CONFIG_X86_IO_APIC) && (CONFIG_ACPI_INTERPRETER || CONFIG_ACPI_BOOT) +#endif /* (CONFIG_X86_IO_APIC) && (CONFIG_ACPI) */ + void __init + setup_unisys () + { + /* + * Determine the generation of the ES7000 currently running. + * + * es7000_plat = 1 if the machine is a 5xx ES7000 box + * es7000_plat = 2 if the machine is a x86_64 ES7000 box + * + */ + if (!(boot_cpu_data.x86 <= 15 && boot_cpu_data.x86_model <= 2)) + es7000_plat = 2; + else + es7000_plat = 1; + ioapic_renumber_irq = es7000_rename_gsi; + } + /* * Parse the OEM Table */ diff --cc drivers/char/ipmi/ipmi_si_intf.c index adbec73b80a6,1abec687865c..278f84104996 --- a/drivers/char/ipmi/ipmi_si_intf.c +++ b/drivers/char/ipmi/ipmi_si_intf.c @@@ -2070,20 -2092,16 +2095,16 @@@ static int init_one_smi(int intf_num, s rv = try_init_mem(intf_num, &new_smi); if (rv) rv = try_init_port(intf_num, &new_smi); -#ifdef CONFIG_ACPI_INTERPRETER +#ifdef CONFIG_ACPI - if ((rv) && (si_trydefaults)) { + if (rv && si_trydefaults) rv = try_init_acpi(intf_num, &new_smi); - } #endif #ifdef CONFIG_X86 - if ((rv) && (si_trydefaults)) { + if (rv && si_trydefaults) rv = try_init_smbios(intf_num, &new_smi); - } #endif - if ((rv) && (si_trydefaults)) { + if (rv && si_trydefaults) rv = try_init_plug_and_play(intf_num, &new_smi); - } - if (rv) return rv;