Skip to contentSkip to conversation

x86/apic changes for v4.1

GIT PULL Ingo Molnar 1 participant 1 message Apr 13, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Linus,

Please pull the latest x86-apic-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-apic-for-linus

# HEAD: 1912c7afa39d2683a574011ff455fe49ada8016c x86/apic/uv: Update the UV APIC HUB check

Changes:

- SGI UV APIC driver updates
- dead code removal.

Thanks,

Ingo

------------------>
Bandan Das (1):
x86/apic: Remove verify_local_APIC()

Mike Travis (3):
x86/apic/uv: Update the APIC UV OEM check x86/apic/uv: Update the UV APIC driver check x86/apic/uv: Update the UV APIC HUB check

 arch/x86/include/asm/apic.h        |  1 -
 arch/x86/kernel/apic/apic.c        | 62 --------------------------
 arch/x86/kernel/apic/x2apic_uv_x.c | 89 +++++++++++++++++++++++++-------------
 arch/x86/kernel/smpboot.c          |  2 -
 4 files changed, 60 insertions(+), 94 deletions(-)
arch/x86/include/asm/apic.h +0 -1
index efc3b22d896e..08f217354442 100644
@@ -204,7 +204,6 @@ extern void clear_local_APIC(void);
 extern void disconnect_bsp_APIC(int virt_wire_setup);
 extern void disable_local_APIC(void);
 extern void lapic_shutdown(void);
-extern int verify_local_APIC(void);
 extern void sync_Arb_IDs(void);
 extern void init_bsp_APIC(void);
 extern void setup_local_APIC(void);
arch/x86/kernel/apic/apic.c +0 -62

74 lines not on this page · raw message

arch/x86/kernel/apic/x2apic_uv_x.c +60 -29

103 lines not on this page · raw message

arch/x86/kernel/smpboot.c +0 -2
index febc6aabc72e..ddd2c0674cda 100644
@@ -1086,8 +1086,6 @@ static int __init smp_sanity_check(unsigned max_cpus)
 		return SMP_NO_APIC;
 	}
 
-	verify_local_APIC();
-
 	/*
 	 * If SMP should be disabled, then really disable it!
 	 */