Commit e3ae0acf authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'x86/uv' into x86/devel

parents 4b62ac9a e7eb8726

arch/x86/kernel/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -93,7 +93,7 @@ obj-$(CONFIG_OLPC) += olpc.o 
###

###

# 64 bit specific files

# 64 bit specific files

ifeq ($(CONFIG_X86_64),y)

ifeq ($(CONFIG_X86_64),y)

        obj-y				+= genapic_64.o genapic_flat_64.o genx2apic_uv_x.o

        obj-y				+= genapic_64.o genapic_flat_64.o genx2apic_uv_x.o tlb_uv.o

        obj-$(CONFIG_X86_PM_TIMER)	+= pmtimer_64.o

        obj-$(CONFIG_X86_PM_TIMER)	+= pmtimer_64.o

        obj-$(CONFIG_AUDIT)		+= audit_64.o

        obj-$(CONFIG_AUDIT)		+= audit_64.o

arch/x86/kernel/apic_32.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1267,7 +1267,7 @@ int __init APIC_init_uniprocessor(void) 
#ifdef CONFIG_CRASH_DUMP

#ifdef CONFIG_CRASH_DUMP

	boot_cpu_physical_apicid = GET_APIC_ID(read_apic_id());

	boot_cpu_physical_apicid = GET_APIC_ID(read_apic_id());

#endif

#endif

	phys_cpu_present_map = physid_mask_of_physid(boot_cpu_physical_apicid);

	physid_set_mask_of_physid(boot_cpu_physical_apicid, &phys_cpu_present_map);





	setup_local_APIC();

	setup_local_APIC();

arch/x86/kernel/apic_64.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -918,7 +918,7 @@ int __init APIC_init_uniprocessor(void) 




	verify_local_APIC();

	verify_local_APIC();





	phys_cpu_present_map = physid_mask_of_physid(boot_cpu_physical_apicid);

	physid_set_mask_of_physid(boot_cpu_physical_apicid, &phys_cpu_present_map);

	apic_write(APIC_ID, SET_APIC_ID(boot_cpu_physical_apicid));

	apic_write(APIC_ID, SET_APIC_ID(boot_cpu_physical_apicid));





	setup_local_APIC();

	setup_local_APIC();

arch/x86/kernel/entry_64.S

+4 −0
Original line number Original line Diff line number Diff line
@@ -719,6 +719,10 @@ ENTRY(apic_timer_interrupt) 
	apicinterrupt LOCAL_TIMER_VECTOR,smp_apic_timer_interrupt

	apicinterrupt LOCAL_TIMER_VECTOR,smp_apic_timer_interrupt

END(apic_timer_interrupt)

END(apic_timer_interrupt)





ENTRY(uv_bau_message_intr1)

	apicinterrupt 220,uv_bau_message_interrupt

END(uv_bau_message_intr1)



ENTRY(error_interrupt)

ENTRY(error_interrupt)

	apicinterrupt ERROR_APIC_VECTOR,smp_error_interrupt

	apicinterrupt ERROR_APIC_VECTOR,smp_error_interrupt

END(error_interrupt)

END(error_interrupt)

arch/x86/kernel/smpboot.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -1090,10 +1090,9 @@ static __init void disable_smp(void) 
	smpboot_clear_io_apic_irqs();

	smpboot_clear_io_apic_irqs();

#endif

#endif

	if (smp_found_config)

	if (smp_found_config)

		phys_cpu_present_map =

		physid_set_mask_of_physid(boot_cpu_physical_apicid, &phys_cpu_present_map);

				physid_mask_of_physid(boot_cpu_physical_apicid);

	else

	else

		phys_cpu_present_map = physid_mask_of_physid(0);

		physid_set_mask_of_physid(0, &phys_cpu_present_map);

	map_cpu_to_logical_apicid();

	map_cpu_to_logical_apicid();

	cpu_set(0, per_cpu(cpu_sibling_map, 0));

	cpu_set(0, per_cpu(cpu_sibling_map, 0));

	cpu_set(0, per_cpu(cpu_core_map, 0));

	cpu_set(0, per_cpu(cpu_core_map, 0));

CRA Git | Maintained and supported by SUSTech CRA and CCSE