# HG changeset patch
# User tristan.gingold@xxxxxxxx
# Node ID eaed13f8c391bfe7f433b4187ba5ee317a383184
# Parent  83f7dfe273a0d5949ba0f193a6bae63e392b5ccd
Cleanup: add static, remove unused code/variables/macros.
Simplifications.

Signed-off-by: Tristan Gingold <tristan.gingold@xxxxxxxx>

diff -r 83f7dfe273a0 -r eaed13f8c391 xen/arch/ia64/linux-xen/smp.c
--- a/xen/arch/ia64/linux-xen/smp.c	Wed Apr 26 05:38:09 2006
+++ b/xen/arch/ia64/linux-xen/smp.c	Wed Apr 26 07:26:20 2006
@@ -57,7 +57,6 @@
 //Huh? This seems to be used on ia64 even if !CONFIG_SMP
 void flush_tlb_mask(cpumask_t mask)
 {
-#ifdef CONFIG_SMP
     int cpu;
 
     cpu = smp_processor_id();
@@ -66,6 +65,7 @@
 	local_flush_tlb_all ();
     }
 
+#ifdef CONFIG_SMP
     if (cpus_empty(mask))
         return;
 
@@ -92,14 +92,6 @@
     for (cpu = 0; cpu < NR_CPUS; ++cpu)
         if (cpu_isset(cpu, mask))
 	    platform_send_ipi(cpu, IA64_IPI_RESCHEDULE, IA64_IPI_DM_INT, 0);
-}
-
-
-//Huh? This seems to be used on ia64 even if !CONFIG_SMP
-int try_flush_tlb_mask(cpumask_t mask)
-{
-	dummy();
-	return 1;
 }
 #endif
 #endif
diff -r 83f7dfe273a0 -r eaed13f8c391 xen/arch/ia64/xen/domain.c
--- a/xen/arch/ia64/xen/domain.c	Wed Apr 26 05:38:09 2006
+++ b/xen/arch/ia64/xen/domain.c	Wed Apr 26 07:26:20 2006
@@ -598,14 +598,13 @@
         p = mfn_to_page((mpaddr >> PAGE_SHIFT));
         return p;
     }
-    else
-#endif
-    {
-        p = alloc_domheap_page(d);
-        // zero out pages for security reasons
-        if (p)
-            clear_page(page_to_virt(p));
-    }
+#endif
+
+    p = alloc_domheap_page(d);
+    // zero out pages for security reasons
+    if (p)
+        clear_page(page_to_virt(p));
+
     if (unlikely(!p)) {
         printf("assign_new_domain_page: Can't alloc!!!! Aaaargh!\n");
         return(p);
diff -r 83f7dfe273a0 -r eaed13f8c391 xen/arch/ia64/xen/regionreg.c
--- a/xen/arch/ia64/xen/regionreg.c	Wed Apr 26 05:38:09 2006
+++ b/xen/arch/ia64/xen/regionreg.c	Wed Apr 26 07:26:20 2006
@@ -250,25 +250,6 @@
 		return 0;
 	}
 
-#if 0
-	memrrv.rrval = rrv.rrval;
-	if (rreg == 7) {
-		newrrv.rid = newrid;
-		newrrv.ve = VHPT_ENABLED_REGION_7;
-		newrrv.ps = IA64_GRANULE_SHIFT;
-		ia64_new_rr7(vmMangleRID(newrrv.rrval),v->vcpu_info,
-				v->arch.privregs);
-	}
-	else {
-		newrrv.rid = newrid;
-		// FIXME? region 6 needs to be uncached for EFI to work
-		if (rreg == 6) newrrv.ve = VHPT_ENABLED_REGION_7;
-		else newrrv.ve = VHPT_ENABLED_REGION_0_TO_6;
-		newrrv.ps = PAGE_SHIFT;
-		if (rreg == 0) v->arch.metaphysical_saved_rr0 = newrrv.rrval;
-		set_rr(rr,newrrv.rrval);
-	}
-#else
 	memrrv.rrval = rrv.rrval;
 	newrrv.rid = newrid;
 	newrrv.ve = 1;  // VHPT now enabled for region 7!!
@@ -285,7 +266,6 @@
 	} else {
 		set_rr(rr,newrrv.rrval);
 	}
-#endif
 	return 1;
 }
 
diff -r 83f7dfe273a0 -r eaed13f8c391 xen/arch/ia64/xen/xenmem.c
--- a/xen/arch/ia64/xen/xenmem.c	Wed Apr 26 05:38:09 2006
+++ b/xen/arch/ia64/xen/xenmem.c	Wed Apr 26 07:26:20 2006
@@ -100,7 +100,7 @@
 	return mfn;
 }
 
-int
+static int
 create_frametable_page_table (u64 start, u64 end, void *arg)
 {
 	unsigned long address, start_page, end_page;
@@ -136,7 +136,7 @@
 	return 0;
 }
 
-int
+static int
 create_mpttable_page_table (u64 start, u64 end, void *arg)
 {
 	unsigned long address, start_page, end_page;
diff -r 83f7dfe273a0 -r eaed13f8c391 xen/arch/ia64/xen/xenmisc.c
--- a/xen/arch/ia64/xen/xenmisc.c	Wed Apr 26 05:38:09 2006
+++ b/xen/arch/ia64/xen/xenmisc.c	Wed Apr 26 07:26:20 2006
@@ -69,21 +69,19 @@
 unsigned long
 gmfn_to_mfn_foreign(struct domain *d, unsigned long gpfn)
 {
+	unsigned long pte;
+
 #ifndef CONFIG_XEN_IA64_DOM0_VP
 	if (d == dom0)
 		return(gpfn);
-	else
 #endif
-	{
-		unsigned long pte = lookup_domain_mpa(d,gpfn << PAGE_SHIFT);
-		if (!pte) {
-printk("gmfn_to_mfn_foreign: bad gpfn. spinning...\n");
-while(1);
-			return 0;
-		}
-		return ((pte & _PFN_MASK) >> PAGE_SHIFT);
+	pte = lookup_domain_mpa(d,gpfn << PAGE_SHIFT);
+	if (!pte) {
+		panic("gmfn_to_mfn_foreign: bad gpfn. spinning...\n");
 	}
-}
+	return ((pte & _PFN_MASK) >> PAGE_SHIFT);
+}
+
 #if 0
 u32
 mfn_to_gmfn(struct domain *d, unsigned long frame)
@@ -96,13 +94,6 @@
 	return frame;
 }
 #endif
-
-///////////////////////////////
-// from arch/x86/flushtlb.c
-///////////////////////////////
-
-u32 tlbflush_clock;
-u32 tlbflush_time[NR_CPUS];
 
 ///////////////////////////////
 // from arch/x86/memory.c
@@ -287,8 +278,8 @@
 static long cnt[16] = { 50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50};
 static int i = 100;
 int id = ((struct vcpu *)current)->domain->domain_id & 0xf;
-if (!cnt[id]--) { printk("%x",id); cnt[id] = 500000; }
-if (!i--) { printk("+"); i = 1000000; }
+if (!cnt[id]--) { cnt[id] = 500000; printk("%x",id); }
+if (!i--) { i = 1000000; printk("+"); }
 }
 
     if (VMX_DOMAIN(current)){
diff -r 83f7dfe273a0 -r eaed13f8c391 xen/include/asm-ia64/flushtlb.h
--- a/xen/include/asm-ia64/flushtlb.h	Wed Apr 26 05:38:09 2006
+++ b/xen/include/asm-ia64/flushtlb.h	Wed Apr 26 07:26:20 2006
@@ -3,14 +3,7 @@
 
 #include <asm/tlbflush.h>
 
-/* The current time as shown by the virtual TLB clock. */
-extern u32 tlbflush_clock;
-
-/* Time at which each CPU's TLB was last flushed. */
-extern u32 tlbflush_time[NR_CPUS];
-
-#define tlbflush_current_time() tlbflush_clock
+#define tlbflush_current_time() 0
 #define tlbflush_filter(x,y) ((void)0)
-#define NEED_FLUSH(x, y) (0)
 
 #endif
diff -r 83f7dfe273a0 -r eaed13f8c391 xen/include/asm-ia64/vhpt.h
--- a/xen/include/asm-ia64/vhpt.h	Wed Apr 26 05:38:09 2006
+++ b/xen/include/asm-ia64/vhpt.h	Wed Apr 26 07:26:20 2006
@@ -2,8 +2,6 @@
 #define ASM_VHPT_H
 
 #define VHPT_ENABLED 1
-#define VHPT_ENABLED_REGION_0_TO_6 1
-#define VHPT_ENABLED_REGION_7 0
 
 /* Size of the VHPT.  */
 #define	VHPT_SIZE_LOG2			24