* Cliff Wickman <cpw@sgi.com> wrote:

> TLB shootdown for SGI UV.

With your patch applied to latest -tip i got build failures with the 
attached config:

 In file included from arch/x86/kernel/tlb_uv.c:14:
 include/asm/mach-bigsmp/mach_apic.h:35: error: expected ')' before 'bitmap'
 include/asm/mach-bigsmp/mach_apic.h: In function 'calculate_ldr':
 include/asm/mach-bigsmp/mach_apic.h:49: error: 'per_cpu__x86_bios_cpu_apicid' undefined

that is a !SMP config.

the patch below fixes it - the most generic way to access the TLB/apic 
methods is to include mach_apic.h.

	Ingo

---
 arch/x86/kernel/tlb_uv.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Index: linux/arch/x86/kernel/tlb_uv.c
===================================================================
--- linux.orig/arch/x86/kernel/tlb_uv.c
+++ linux/arch/x86/kernel/tlb_uv.c
@@ -10,7 +10,6 @@
 #include <linux/proc_fs.h>
 #include <linux/kernel.h>
 
-#include <asm/mach-bigsmp/mach_apic.h>
 #include <asm/mmu_context.h>
 #include <asm/idle.h>
 #include <asm/genapic.h>
@@ -19,6 +18,8 @@
 #include <asm/uv/uv_bau.h>
 #include <asm/tsc.h>
 
+#include <mach_apic.h>
+
 static struct bau_control **uv_bau_table_bases __read_mostly;
 static int uv_bau_retry_limit __read_mostly;
 static int uv_nshift __read_mostly; /* position of pnode (which is nasid>>1) */