Cleanup: Make local functions static and remove unused functions.

Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>

17 files changed, 34 insertions, 58 deletions

diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c
index a590bdfef8..cfcd621a04 100644
--- a/xen/arch/x86/apic.c
+++ b/xen/arch/x86/apic.c
@@ -52,7 +52,7 @@ int x2apic_enabled __read_mostly = 0;
 
 static void apic_pm_activate(void);
 
-int modern_apic(void)
+static int modern_apic(void)
 {
     unsigned int lvr, version;
     /* AMD systems use old APIC versions, so check the CPU */
@@ -995,7 +995,7 @@ void (*wait_timer_tick)(void) __initdata = wait_8254_wraparound;
 
 #define APIC_DIVISOR 1
 
-void __setup_APIC_LVTT(unsigned int clocks)
+static void __setup_APIC_LVTT(unsigned int clocks)
 {
     unsigned int lvtt_value, tmp_value, ver;
 
@@ -1033,7 +1033,7 @@ static void __devinit setup_APIC_timer(unsigned int clocks)
  * APIC irq that way.
  */
 
-int __init calibrate_APIC_clock(void)
+static int __init calibrate_APIC_clock(void)
 {
     unsigned long long t1 = 0, t2 = 0;
     long tt1, tt2;
@@ -1107,11 +1107,6 @@ int __init calibrate_APIC_clock(void)
     return result;
 }
 
-u32 get_apic_bus_cycle(void)
-{
-    return bus_cycle;
-}
-
 static unsigned int calibration_result;
 
 void __init setup_boot_APIC_clock(void)
diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c
index b88a4a1b98..b9dd35a1cb 100644
--- a/xen/arch/x86/cpu/intel.c
+++ b/xen/arch/x86/cpu/intel.c
@@ -69,26 +69,6 @@ void __devinit early_intel_workaround(struct cpuinfo_x86 *c)
 }
 
 /*
- *	Early probe support logic for ppro memory erratum #50
- *
- *	This is called before we do cpu ident work
- */
- 
-int __devinit ppro_with_ram_bug(void)
-{
-	/* Uses data from early_cpu_detect now */
-	if (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL &&
-	    boot_cpu_data.x86 == 6 &&
-	    boot_cpu_data.x86_model == 1 &&
-	    boot_cpu_data.x86_mask < 8) {
-		printk(KERN_INFO "Pentium Pro with Errata#50 detected. Taking evasive action.\n");
-		return 1;
-	}
-	return 0;
-}
-	
-
-/*
  * P4 Xeon errata 037 workaround.
  * Hardware prefetcher may cause stale data to be loaded into the cache.
  */
diff --git a/xen/arch/x86/cpu/mcheck/amd_nonfatal.c b/xen/arch/x86/cpu/mcheck/amd_nonfatal.c
index 9bec5de8dc..f2fedcd299 100644
--- a/xen/arch/x86/cpu/mcheck/amd_nonfatal.c
+++ b/xen/arch/x86/cpu/mcheck/amd_nonfatal.c
@@ -80,7 +80,7 @@ static int variable_period = 1;
  * Collects information of correctable errors and notifies
  * Dom0 via an event.
  */
-void mce_amd_checkregs(void *info)
+static void mce_amd_checkregs(void *info)
 {
 	mctelem_cookie_t mctc;
 	struct mca_summary bs;
diff --git a/xen/arch/x86/cpu/mcheck/mce_intel.c b/xen/arch/x86/cpu/mcheck/mce_intel.c
index 4b86451ce2..03160b48f8 100644
--- a/xen/arch/x86/cpu/mcheck/mce_intel.c
+++ b/xen/arch/x86/cpu/mcheck/mce_intel.c
@@ -329,7 +329,7 @@ static int inject_mce(struct domain *d)
     return 0;
 }
 
-void intel_UCR_handler(struct mcinfo_bank *bank,
+static void intel_UCR_handler(struct mcinfo_bank *bank,
              struct mcinfo_global *global,
              struct mcinfo_extended *extension,
              struct mca_handle_result *result)
diff --git a/xen/arch/x86/genapic/x2apic.c b/xen/arch/x86/genapic/x2apic.c
index c57a66eeac..f76cf945d9 100644
--- a/xen/arch/x86/genapic/x2apic.c
+++ b/xen/arch/x86/genapic/x2apic.c
@@ -29,13 +29,13 @@ boolean_param("x2apic", x2apic);
 static int x2apic_phys = 0; /* By default we use logical cluster mode. */
 boolean_param("x2apic_phys", x2apic_phys);
 
-__init int probe_x2apic_phys(void)
+static int __init probe_x2apic_phys(void)
 {
     return x2apic && x2apic_phys && x2apic_is_available() &&
         iommu_supports_eim();
 }
 
-__init int probe_x2apic_cluster(void)
+static int __init probe_x2apic_cluster(void)
 {
     return x2apic && !x2apic_phys && x2apic_is_available() &&
         iommu_supports_eim();
diff --git a/xen/arch/x86/hvm/i8254.c b/xen/arch/x86/hvm/i8254.c
index 50c5493eb5..702a843640 100644
--- a/xen/arch/x86/hvm/i8254.c
+++ b/xen/arch/x86/hvm/i8254.c
@@ -151,7 +151,7 @@ static void pit_set_gate(PITState *pit, int channel, int val)
     s->gate = val;
 }
 
-int pit_get_gate(PITState *pit, int channel)
+static int pit_get_gate(PITState *pit, int channel)
 {
     ASSERT(spin_is_locked(&pit->lock));
     return pit->hw.channels[channel].gate;
diff --git a/xen/arch/x86/hvm/io.c b/xen/arch/x86/hvm/io.c
index 0d7f5ffa6b..42a7b63b98 100644
--- a/xen/arch/x86/hvm/io.c
+++ b/xen/arch/x86/hvm/io.c
@@ -244,7 +244,7 @@ void hvm_io_assist(void)
         vcpu_end_shutdown_deferral(curr);
 }
 
-void dpci_ioport_read(uint32_t mport, ioreq_t *p)
+static void dpci_ioport_read(uint32_t mport, ioreq_t *p)
 {
     int i, sign = p->df ? -1 : 1;
     uint32_t data = 0;
@@ -274,7 +274,7 @@ void dpci_ioport_read(uint32_t mport, ioreq_t *p)
     }
 }
 
-void dpci_ioport_write(uint32_t mport, ioreq_t *p)
+static void dpci_ioport_write(uint32_t mport, ioreq_t *p)
 {
     int i, sign = p->df ? -1 : 1;
     uint32_t data;
diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c
index bdd2473a18..476b39569d 100644
--- a/xen/arch/x86/hvm/vlapic.c
+++ b/xen/arch/x86/hvm/vlapic.c
@@ -146,7 +146,7 @@ static int vlapic_find_highest_isr(struct vlapic *vlapic)
     return vlapic_find_highest_vector(&vlapic->regs->data[APIC_ISR]);
 }
 
-uint32_t vlapic_get_ppr(struct vlapic *vlapic)
+static uint32_t vlapic_get_ppr(struct vlapic *vlapic)
 {
     uint32_t tpr, isrv, ppr;
     int isr;
@@ -531,7 +531,7 @@ static int vlapic_read(
     return X86EMUL_OKAY;
 }
 
-void vlapic_pt_cb(struct vcpu *v, void *data)
+static void vlapic_pt_cb(struct vcpu *v, void *data)
 {
     *(s_time_t *)data = hvm_get_guest_time(v);
 }
diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c
index 47f324c276..265e40fc33 100644
--- a/xen/arch/x86/io_apic.c
+++ b/xen/arch/x86/io_apic.c
@@ -911,7 +911,7 @@ static inline void UNEXPECTED_IO_APIC(void)
 {
 }
 
-void /*__init*/ __print_IO_APIC(void)
+static void /*__init*/ __print_IO_APIC(void)
 {
     int apic, i;
     union IO_APIC_reg_00 reg_00;
@@ -2105,7 +2105,7 @@ static int ioapic_physbase_to_id(unsigned long physbase)
 
 unsigned apic_gsi_base(int apic);
 
-int apic_pin_2_gsi_irq(int apic, int pin)
+static int apic_pin_2_gsi_irq(int apic, int pin)
 {
     int idx, irq;
 
diff --git a/xen/arch/x86/ioport_emulate.c b/xen/arch/x86/ioport_emulate.c
index 64377533cf..d76f1ea567 100644
--- a/xen/arch/x86/ioport_emulate.c
+++ b/xen/arch/x86/ioport_emulate.c
@@ -42,7 +42,7 @@ static void ioemul_handle_proliant_quirk(
     io_emul_stub[9] = 0xc3;
 }
 
-int __init proliant_quirk(struct dmi_system_id *d)
+static int __init proliant_quirk(struct dmi_system_id *d)
 {
     ioemul_handle_quirk = ioemul_handle_proliant_quirk;
     return 0;
@@ -121,7 +121,7 @@ static struct dmi_system_id __initdata ioport_quirks_tbl[] = {
     { }
 };
 
-int __init ioport_quirks_init(void)
+static int __init ioport_quirks_init(void)
 {
     dmi_check_system(ioport_quirks_tbl);
     return 0;
diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c
index b780d03ed8..2ca28ac281 100644
--- a/xen/arch/x86/irq.c
+++ b/xen/arch/x86/irq.c
@@ -147,7 +147,7 @@ out:
     return irq;
 }
 
-void dynamic_irq_cleanup(unsigned int irq)
+static void dynamic_irq_cleanup(unsigned int irq)
 {
     struct irq_desc *desc = irq_to_desc(irq);
     unsigned long flags;
diff --git a/xen/arch/x86/mm/hap/guest_walk.c b/xen/arch/x86/mm/hap/guest_walk.c
index 425031508d..0ad2ec8370 100644
--- a/xen/arch/x86/mm/hap/guest_walk.c
+++ b/xen/arch/x86/mm/hap/guest_walk.c
@@ -24,6 +24,7 @@
 #include <xen/paging.h>
 #include <xen/config.h>
 #include <xen/sched.h>
+#include "private.h" /* for hap_gva_to_gfn_* */
 
 #define _hap_gva_to_gfn(levels) hap_gva_to_gfn_##levels##level
 #define hap_gva_to_gfn(levels) _hap_gva_to_gfn(levels)
diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c
index 74993ee0ad..bcbda3b703 100644
--- a/xen/arch/x86/mm/hap/hap.c
+++ b/xen/arch/x86/mm/hap/hap.c
@@ -55,7 +55,7 @@
 /*          HAP VRAM TRACKING SUPPORT           */
 /************************************************/
 
-int hap_enable_vram_tracking(struct domain *d)
+static int hap_enable_vram_tracking(struct domain *d)
 {
     int i;
     struct sh_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram;
@@ -76,7 +76,7 @@ int hap_enable_vram_tracking(struct domain *d)
     return 0;
 }
 
-int hap_disable_vram_tracking(struct domain *d)
+static int hap_disable_vram_tracking(struct domain *d)
 {
     int i;
     struct sh_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram;
@@ -96,7 +96,7 @@ int hap_disable_vram_tracking(struct domain *d)
     return 0;
 }
 
-void hap_clean_vram_tracking(struct domain *d)
+static void hap_clean_vram_tracking(struct domain *d)
 {
     int i;
     struct sh_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram;
@@ -111,7 +111,7 @@ void hap_clean_vram_tracking(struct domain *d)
     flush_tlb_mask(&d->domain_dirty_cpumask);
 }
 
-void hap_vram_tracking_init(struct domain *d)
+static void hap_vram_tracking_init(struct domain *d)
 {
     paging_log_dirty_init(d, hap_enable_vram_tracking,
                           hap_disable_vram_tracking,
@@ -192,7 +192,7 @@ param_fail:
 /************************************************/
 
 /* hap code to call when log_dirty is enable. return 0 if no problem found. */
-int hap_enable_log_dirty(struct domain *d)
+static int hap_enable_log_dirty(struct domain *d)
 {
     /* turn on PG_log_dirty bit in paging mode */
     hap_lock(d);
@@ -205,7 +205,7 @@ int hap_enable_log_dirty(struct domain *d)
     return 0;
 }
 
-int hap_disable_log_dirty(struct domain *d)
+static int hap_disable_log_dirty(struct domain *d)
 {
     hap_lock(d);
     d->arch.paging.mode &= ~PG_log_dirty;
@@ -216,7 +216,7 @@ int hap_disable_log_dirty(struct domain *d)
     return 0;
 }
 
-void hap_clean_dirty_bitmap(struct domain *d)
+static void hap_clean_dirty_bitmap(struct domain *d)
 {
     /* set l1e entries of P2M table to be read-only. */
     p2m_change_entry_type_global(d, p2m_ram_rw, p2m_ram_logdirty);
@@ -312,7 +312,7 @@ static struct page_info *hap_alloc_p2m_page(struct domain *d)
     return pg;
 }
 
-void hap_free_p2m_page(struct domain *d, struct page_info *pg)
+static void hap_free_p2m_page(struct domain *d, struct page_info *pg)
 {
     hap_lock(d);
     ASSERT(page_get_owner(pg) == d);
diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c
index dfbd3fa781..10021b7102 100644
--- a/xen/arch/x86/mm/p2m.c
+++ b/xen/arch/x86/mm/p2m.c
@@ -230,7 +230,7 @@ static
 int set_p2m_entry(struct domain *d, unsigned long gfn, mfn_t mfn, 
                   unsigned int page_order, p2m_type_t p2mt);
 
-int
+static int
 p2m_pod_cache_add(struct domain *d,
                   struct page_info *page,
                   unsigned long order)
diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c
index 051c5dc1f2..94b745f0fd 100644
--- a/xen/arch/x86/mm/paging.c
+++ b/xen/arch/x86/mm/paging.c
@@ -626,7 +626,7 @@ void paging_log_dirty_init(struct domain *d,
 }
 
 /* This function fress log dirty bitmap resources. */
-void paging_log_dirty_teardown(struct domain*d)
+static void paging_log_dirty_teardown(struct domain*d)
 {
     log_dirty_lock(d);
     paging_free_log_dirty_bitmap(d);
diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c
index e8116afe1c..37301feb3a 100644
--- a/xen/arch/x86/traps.c
+++ b/xen/arch/x86/traps.c
@@ -63,6 +63,7 @@
 #include <asm/x86_emulate.h>
 #include <asm/traps.h>
 #include <asm/hvm/vpt.h>
+#include <asm/hypercall.h>
 #include <public/arch-x86/cpuid.h>
 
 /*
@@ -383,7 +384,7 @@ void vcpu_show_execution_state(struct vcpu *v)
     vcpu_unpause(v);
 }
 
-char *trapstr(int trapnr)
+static char *trapstr(int trapnr)
 {
     static char *strings[] = { 
         "divide error", "debug", "nmi", "bkpt", "overflow", "bounds", 
@@ -2872,7 +2873,7 @@ static void nmi_dom0_report(unsigned int reason_idx)
     send_guest_trap(d, 0, TRAP_nmi);
 }
 
-asmlinkage void mem_parity_error(struct cpu_user_regs *regs)
+static void mem_parity_error(struct cpu_user_regs *regs)
 {
     switch ( opt_nmi[0] )
     {
@@ -2891,7 +2892,7 @@ asmlinkage void mem_parity_error(struct cpu_user_regs *regs)
     outb((inb(0x61) & 0x0b) | 0x00, 0x61); /* enable parity check */
 }
 
-asmlinkage void io_check_error(struct cpu_user_regs *regs)
+static void io_check_error(struct cpu_user_regs *regs)
 {
     switch ( opt_nmi[0] )
     {
diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c
index f2dfdf0c19..3592f0e8f6 100644
--- a/xen/arch/x86/x86_emulate/x86_emulate.c
+++ b/xen/arch/x86/x86_emulate/x86_emulate.c
@@ -1183,9 +1183,8 @@ decode_register(
 }
 
 #define decode_segment_failed x86_seg_tr
-enum x86_segment
-decode_segment(
-    uint8_t modrm_reg)
+static enum x86_segment
+decode_segment(uint8_t modrm_reg)
 {
     switch ( modrm_reg )
     {