Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block

[linux-2.6-omap-h63xx.git] / include / asm-x86_64 / tlbflush.h

diff --git a/include/asm-x86_64/tlbflush.h b/include/asm-x86_64/tlbflush.h
index 983bd296c81a304281530c972f6f38c4b1384d95..512401b8725fa5436482434ac1f5d3aeefa83952 100644 (file)
--- a/include/asm-x86_64/tlbflush.h
+++ b/include/asm-x86_64/tlbflush.h
@@ -3,41 +3,18 @@
 
 #include <linux/mm.h>
 #include <asm/processor.h>
-
-static inline unsigned long get_cr3(void)
-{
-       unsigned long cr3;
-       asm volatile("mov %%cr3,%0" : "=r" (cr3));
-       return cr3;
-}
-
-static inline void set_cr3(unsigned long cr3)
-{
-       asm volatile("mov %0,%%cr3" :: "r" (cr3) : "memory");
-}
+#include <asm/system.h>
 
 static inline void __flush_tlb(void)
 {
-       set_cr3(get_cr3());
-}
-
-static inline unsigned long get_cr4(void)
-{
-       unsigned long cr4;
-       asm volatile("mov %%cr4,%0" : "=r" (cr4));
-       return cr4;
-}
-
-static inline void set_cr4(unsigned long cr4)
-{
-       asm volatile("mov %0,%%cr4" :: "r" (cr4) : "memory");
+       write_cr3(read_cr3());
 }
 
 static inline void __flush_tlb_all(void)
 {
-       unsigned long cr4 = get_cr4();
-       set_cr4(cr4 & ~X86_CR4_PGE);    /* clear PGE */
-       set_cr4(cr4);                   /* write old PGE again and flush TLBs */
+       unsigned long cr4 = read_cr4();
+       write_cr4(cr4 & ~X86_CR4_PGE);  /* clear PGE */
+       write_cr4(cr4);                 /* write old PGE again and flush TLBs */
 }
 
 #define __flush_tlb_one(addr) \