linux/x86: Remove useless wrappers

Signed-off-by: Jan Beulich <jbeulich@novell.com>

diff --git a/arch/i386/kernel/smp-xen.c b/arch/i386/kernel/smp-xen.c
index 402819df0cfe5c014afddd98e42920cf0b29bed2..97511d3da54b6ecdcdb6c652eddda6d623706951 100644 (file)
--- a/arch/i386/kernel/smp-xen.c
+++ b/arch/i386/kernel/smp-xen.c
@@ -441,21 +441,6 @@ void flush_tlb_all(void)
        on_each_cpu(do_flush_tlb_all, NULL, 1, 1);
 }
 
-#else
-
-irqreturn_t smp_invalidate_interrupt(int irq, void *dev_id,
-                                    struct pt_regs *regs)
-{ return 0; }
-void flush_tlb_current_task(void)
-{ xen_tlb_flush_mask(&current->mm->cpu_vm_mask); }
-void flush_tlb_mm(struct mm_struct * mm)
-{ xen_tlb_flush_mask(&mm->cpu_vm_mask); }
-void flush_tlb_page(struct vm_area_struct *vma, unsigned long va)
-{ xen_invlpg_mask(&vma->vm_mm->cpu_vm_mask, va); }
-EXPORT_SYMBOL(flush_tlb_page);
-void flush_tlb_all(void)
-{ xen_tlb_flush_all(); }
-
 #endif /* XEN */
 
 /*

diff --git a/arch/x86_64/kernel/smp-xen.c b/arch/x86_64/kernel/smp-xen.c
index 727c255a95157b21f9c1d130b3a0a12a85f173eb..d78265cac56d58456f8751e35ea3a98b27a7908c 100644 (file)
--- a/arch/x86_64/kernel/smp-xen.c
+++ b/arch/x86_64/kernel/smp-xen.c
@@ -289,17 +289,6 @@ void flush_tlb_all(void)
 {
        on_each_cpu(do_flush_tlb_all, NULL, 1, 1);
 }
-#else
-asmlinkage void smp_invalidate_interrupt (void)
-{ return; }
-void flush_tlb_current_task(void)
-{ xen_tlb_flush_mask(&current->mm->cpu_vm_mask); }
-void flush_tlb_mm (struct mm_struct * mm)
-{ xen_tlb_flush_mask(&mm->cpu_vm_mask); }
-void flush_tlb_page(struct vm_area_struct * vma, unsigned long va)
-{ xen_invlpg_mask(&vma->vm_mm->cpu_vm_mask, va); }
-void flush_tlb_all(void)
-{ xen_tlb_flush_all(); }
 #endif /* Xen */
 
 /*

diff --git a/include/asm-i386/mach-xen/asm/tlbflush.h b/include/asm-i386/mach-xen/asm/tlbflush.h
index 259f0be5830f735c54c16b3f2126ece09b4ef0fa..58b75c2064b427da002ea8f98bde0c774ce6f743 100644 (file)
--- a/include/asm-i386/mach-xen/asm/tlbflush.h
+++ b/include/asm-i386/mach-xen/asm/tlbflush.h
@@ -64,10 +64,10 @@ static inline void flush_tlb_range(struct vm_area_struct *vma,
 #define local_flush_tlb() \
        __flush_tlb()
 
-extern void flush_tlb_all(void);
-extern void flush_tlb_current_task(void);
-extern void flush_tlb_mm(struct mm_struct *);
-extern void flush_tlb_page(struct vm_area_struct *, unsigned long);
+#define flush_tlb_all xen_tlb_flush_all
+#define flush_tlb_current_task() xen_tlb_flush_mask(&current->mm->cpu_vm_mask)
+#define flush_tlb_mm(mm) xen_tlb_flush_mask(&(mm)->cpu_vm_mask)
+#define flush_tlb_page(vma, va) xen_invlpg_mask(&(vma)->vm_mm->cpu_vm_mask, va)
 
 #define flush_tlb()    flush_tlb_current_task()
 

diff --git a/include/asm-x86_64/mach-xen/asm/tlbflush.h b/include/asm-x86_64/mach-xen/asm/tlbflush.h
index 3a817746c286fcad5897de24eb1b3fe3a3273b7e..f39bfdfb06e8a532d5c78ed05bce4f0b30046202 100644 (file)
--- a/include/asm-x86_64/mach-xen/asm/tlbflush.h
+++ b/include/asm-x86_64/mach-xen/asm/tlbflush.h
@@ -69,10 +69,10 @@ static inline void flush_tlb_range(struct vm_area_struct *vma,
 #define local_flush_tlb() \
        __flush_tlb()
 
-extern void flush_tlb_all(void);
-extern void flush_tlb_current_task(void);
-extern void flush_tlb_mm(struct mm_struct *);
-extern void flush_tlb_page(struct vm_area_struct *, unsigned long);
+#define flush_tlb_all xen_tlb_flush_all
+#define flush_tlb_current_task() xen_tlb_flush_mask(&current->mm->cpu_vm_mask)
+#define flush_tlb_mm(mm) xen_tlb_flush_mask(&(mm)->cpu_vm_mask)
+#define flush_tlb_page(vma, va) xen_invlpg_mask(&(vma)->vm_mm->cpu_vm_mask, va)
 
 #define flush_tlb()    flush_tlb_current_task()