linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] Fix x86-64 genapic build
@ 2004-10-28 23:08 Andi Kleen
  2004-10-28 23:30 ` Andrew Morton
  0 siblings, 1 reply; 2+ messages in thread
From: Andi Kleen @ 2004-10-28 23:08 UTC (permalink / raw)
  To: torvalds, akpm, linux-kernel, discuss


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 <ak@muc.de>

diff -puN include/asm-x86_64/apicdef.h~kexec-apic-virtwire-on-shutdownx86_64 include/asm-x86_64/apicdef.h
--- 25/include/asm-x86_64/apicdef.h~kexec-apic-virtwire-on-shutdownx86_64	2004-10-16 01:30:50.550815752 -0700
+++ 25-akpm/include/asm-x86_64/apicdef.h	2004-10-16 01:30:50.555814992 -0700
@@ -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
_

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] Fix x86-64 genapic build
  2004-10-28 23:08 [PATCH] Fix x86-64 genapic build Andi Kleen
@ 2004-10-28 23:30 ` Andrew Morton
  0 siblings, 0 replies; 2+ messages in thread
From: Andrew Morton @ 2004-10-28 23:30 UTC (permalink / raw)
  To: Andi Kleen; +Cc: torvalds, linux-kernel, discuss

Andi Kleen <ak@muc.de> wrote:
>
> 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.


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2004-10-28 23:30 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2004-10-28 23:08 [PATCH] Fix x86-64 genapic build Andi Kleen
2004-10-28 23:30 ` Andrew Morton

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).