lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Thu, 22 Jan 2015 06:29:47 -0800 From: tip-bot for Thomas Gleixner <tipbot@...or.com> To: linux-tip-commits@...r.kernel.org Cc: hpa@...or.com, joro@...tes.org, tony.luck@...el.com, linux-kernel@...r.kernel.org, mingo@...nel.org, bp@...en8.de, jiang.liu@...ux.intel.com, tglx@...utronix.de Subject: [tip:x86/apic] x86/apic: Sanitize ioapic handling Commit-ID: 35e4c6d30e6f69745d77afd5f63203ad440bed12 Gitweb: http://git.kernel.org/tip/35e4c6d30e6f69745d77afd5f63203ad440bed12 Author: Thomas Gleixner <tglx@...utronix.de> AuthorDate: Thu, 15 Jan 2015 21:22:34 +0000 Committer: Thomas Gleixner <tglx@...utronix.de> CommitDate: Thu, 22 Jan 2015 15:10:55 +0100 x86/apic: Sanitize ioapic handling We have proper stubs for the IOAPIC=n case and the setup/enable function have the required checks inside now. Remove the ifdeffery and the copy&pasted conditionals. Signed-off-by: Thomas Gleixner <tglx@...utronix.de>C Acked-by: Borislav Petkov <bp@...en8.de> Cc: Jiang Liu <jiang.liu@...ux.intel.com> Cc: Joerg Roedel <joro@...tes.org> Cc: Tony Luck <tony.luck@...el.com> Link: http://lkml.kernel.org/r/20150115211703.569830549@linutronix.de Signed-off-by: Thomas Gleixner <tglx@...utronix.de> --- arch/x86/kernel/apic/apic.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index 0c554f5..3b4bdd5 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -1905,24 +1905,13 @@ int __init APIC_init_uniprocessor(void) physid_set_mask_of_physid(boot_cpu_physical_apicid, &phys_cpu_present_map); setup_local_APIC(); -#ifdef CONFIG_X86_IO_APIC - /* - * Now enable IO-APICs, actually call clear_IO_APIC - * We need clear_IO_APIC before enabling error vector - */ - if (!skip_ioapic_setup && nr_ioapics) - enable_IO_APIC(); -#endif + /* Enable IO-APICs before enabling error vector */ + enable_IO_APIC(); bsp_end_local_APIC_setup(); -#ifdef CONFIG_X86_IO_APIC - if (smp_found_config && !skip_ioapic_setup && nr_ioapics) + if (smp_found_config) setup_IO_APIC(); - else { - nr_ioapics = 0; - } -#endif x86_init.timers.setup_percpu_clockev(); return 0; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists