Skip to contentSkip to conversation

Fix x86-64 genapic build

PATCH In review Andi Kleen 2 participants 2 messages Oct 28, 2004

lore
Share & tools
lore

Andi Kleen

author
#0 lore raw

PATCH 1/1 Fix x86-64 genapic build

He x86-64 genapic patch that was recently merged missed some definitions and doesn't compile at all. This patch fixes it.

Please apply ASAP.

Add missing defines for genapic

Signed-off-by Andi Kleen <[email protected]>
include/asm-x86_64/apicdef.h renamed from include/asm-x86_64/apicdef.h~kexec-apic-virtwire-on-shutdownx86_64 +3 -0
diff -puN include/asm-x86_64/apicdef.h~kexec-apic-virtwire-on-shutdownx86_64 include/asm-x86_64/apicdef.h
@@ -32,6 +32,8 @@
 #define			SET_APIC_LOGICAL_ID(x)	(((x)<<24))
 #define			APIC_ALL_CPUS		0xFFu
 #define		APIC_DFR	0xE0
+#define			APIC_DFR_CLUSTER		0x0FFFFFFFul
+#define			APIC_DFR_FLAT			0xFFFFFFFFul
 #define		APIC_SPIV	0xF0
 #define			APIC_SPIV_FOCUS_DISABLED	(1<<9)
 #define			APIC_SPIV_APIC_ENABLED		(1<<8)

@@ -87,6 +89,7 @@
 #define			APIC_LVT_REMOTE_IRR		(1<<14)
 #define			APIC_INPUT_POLARITY		(1<<13)
 #define			APIC_SEND_PENDING		(1<<12)
+#define			APIC_MODE_MASK			0x700
 #define			GET_APIC_DELIVERY_MODE(x)	(((x)>>8)&0x7)
 #define			SET_APIC_DELIVERY_MODE(x,y)	(((x)&~0x700)|((y)<<8))
 #define				APIC_MODE_FIXED		0x0

_

#1 lore raw
Quoted 3 lines · Andi Kleen

He x86-64 genapic patch that was recently merged missed some definitions and doesn't compile at all.

oop. A hasty postmortem at akpmlabs reveals that the kexec patches were providing these definitions. And they're identical, so all is well.