summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2008-01-30 23:27:58 +0100
committerIngo Molnar <mingo@elte.hu>2008-01-30 23:27:58 +0100
commitc18d1250c7425dddd2633ce4eaf03d5015e68a0f (patch)
tree03e93034b55c35d8a2f6d72a444ee090a88fe0e6
parentia64: on UP percpu variables are not small memory model (diff)
downloadlinux-c18d1250c7425dddd2633ce4eaf03d5015e68a0f.tar.xz
linux-c18d1250c7425dddd2633ce4eaf03d5015e68a0f.zip
alpha: fix x86.git merge build error
a5a19c63f4e55e32dc0bc3d936d7f94793d8b380 removed the include of asm/pgalloc.h from asm-generic/tlb.h. That works fine on most architectures, but broke ALPHA. Fixup ALPHA by adding the include to asm-alpha/tlbflush.h Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--include/asm-alpha/tlbflush.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-alpha/tlbflush.h b/include/asm-alpha/tlbflush.h
index eefab3fb51ae..b9e9147226f7 100644
--- a/include/asm-alpha/tlbflush.h
+++ b/include/asm-alpha/tlbflush.h
@@ -3,6 +3,7 @@
#include <linux/mm.h>
#include <asm/compiler.h>
+#include <asm/pgalloc.h>
#ifndef __EXTERN_INLINE
#define __EXTERN_INLINE extern inline