[Xen-changelog] [linux-2.6.18-xen] linux/x86: Remove useless wrappers

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1195741364 0
# Node ID f3289de500c37905733faaed4d4bbb6d78a34e0a
# Parent  fac1d2462ab415296cdd29c027a149910910ece9
linux/x86: Remove useless wrappers
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
---
 arch/i386/kernel/smp-xen.c                 |   15 ---------------
 arch/x86_64/kernel/smp-xen.c               |   11 -----------
 include/asm-i386/mach-xen/asm/tlbflush.h   |    8 ++++----
 include/asm-x86_64/mach-xen/asm/tlbflush.h |    8 ++++----
 4 files changed, 8 insertions(+), 34 deletions(-)

diff -r fac1d2462ab4 -r f3289de500c3 arch/i386/kernel/smp-xen.c
--- a/arch/i386/kernel/smp-xen.c        Thu Nov 22 14:22:05 2007 +0000
+++ b/arch/i386/kernel/smp-xen.c        Thu Nov 22 14:22:44 2007 +0000
@@ -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 -r fac1d2462ab4 -r f3289de500c3 arch/x86_64/kernel/smp-xen.c
--- a/arch/x86_64/kernel/smp-xen.c      Thu Nov 22 14:22:05 2007 +0000
+++ b/arch/x86_64/kernel/smp-xen.c      Thu Nov 22 14:22:44 2007 +0000
@@ -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 -r fac1d2462ab4 -r f3289de500c3 include/asm-i386/mach-xen/asm/tlbflush.h
--- a/include/asm-i386/mach-xen/asm/tlbflush.h  Thu Nov 22 14:22:05 2007 +0000
+++ b/include/asm-i386/mach-xen/asm/tlbflush.h  Thu Nov 22 14:22:44 2007 +0000
@@ -64,10 +64,10 @@ static inline void flush_tlb_range(struc
 #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 -r fac1d2462ab4 -r f3289de500c3 include/asm-x86_64/mach-xen/asm/tlbflush.h
--- a/include/asm-x86_64/mach-xen/asm/tlbflush.h        Thu Nov 22 14:22:05 
2007 +0000
+++ b/include/asm-x86_64/mach-xen/asm/tlbflush.h        Thu Nov 22 14:22:44 
2007 +0000
@@ -69,10 +69,10 @@ static inline void flush_tlb_range(struc
 #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()
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog