x86: Consolidate boot cpu timer setup (9c4d9c73) · Commits · 戴 / test

Now that the APIC bringup is consolidated we can move the setup call for the percpu clock event device to apic_bsp_setup(). Signed-off-by:

Thomas Gleixner <tglx@linutronix.de> Cc: Jiang Liu <jiang.liu@linux.intel.com> Cc: Joerg Roedel <joro@8bytes.org> Cc: Tony Luck <tony.luck@intel.com> Cc: Borislav Petkov <bp@alien8.de> Link: http://lkml.kernel.org/r/20150115211704.162567839@linutronix.de Signed-off-by:

arch/x86/kernel/apic/apic.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -2244,6 +2244,8 @@ int __init apic_bsp_setup(bool upmode)
		end_local_APIC_setup();
		irq_remap_enable_fault_handling();
		setup_IO_APIC();
		/* Setup local timer */
		x86_init.timers.setup_percpu_clockev();
		return id;
		}

		@@ -2284,8 +2286,6 @@ int __init APIC_init_uniprocessor(void)
		default_setup_apic_routing();
		verify_local_APIC();
		apic_bsp_setup(true);

		x86_init.timers.setup_percpu_clockev();
		return 0;
		}

+0 −4

Original line number	Diff line number	Diff line
		@@ -1163,12 +1163,8 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus)

		cpu0_logical_apicid = apic_bsp_setup(false);

		/*
		* Set up local APIC timer on boot CPU.
		*/
		pr_info("CPU%d: ", 0);
		print_cpu_info(&cpu_data(0));
		x86_init.timers.setup_percpu_clockev();

		if (is_uv_system())
		uv_system_init();