diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-02 08:39:09 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-02 08:39:09 -0400 |
| commit | d2f6409584e2c62ffad81690562330ff3bf4a458 (patch) | |
| tree | 3bdfb97d0b51be2f7f414f2107e97603c1206abb /include/asm-x86_64/tlbflush.h | |
| parent | e1b09eba2686eca94a3a188042b518df6044a3c1 (diff) | |
| parent | 4a89a04f1ee21a7c1f4413f1ad7dcfac50ff9b63 (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/asm-x86_64/tlbflush.h')
| -rw-r--r-- | include/asm-x86_64/tlbflush.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/include/asm-x86_64/tlbflush.h b/include/asm-x86_64/tlbflush.h index 2e811ac262af..061742382520 100644 --- a/include/asm-x86_64/tlbflush.h +++ b/include/asm-x86_64/tlbflush.h | |||
| @@ -22,16 +22,18 @@ | |||
| 22 | */ | 22 | */ |
| 23 | #define __flush_tlb_global() \ | 23 | #define __flush_tlb_global() \ |
| 24 | do { \ | 24 | do { \ |
| 25 | unsigned long tmpreg; \ | 25 | unsigned long tmpreg, cr4, cr4_orig; \ |
| 26 | \ | 26 | \ |
| 27 | __asm__ __volatile__( \ | 27 | __asm__ __volatile__( \ |
| 28 | "movq %1, %%cr4; # turn off PGE \n" \ | 28 | "movq %%cr4, %2; # turn off PGE \n" \ |
| 29 | "movq %2, %1; \n" \ | ||
| 30 | "andq %3, %1; \n" \ | ||
| 31 | "movq %1, %%cr4; \n" \ | ||
| 29 | "movq %%cr3, %0; # flush TLB \n" \ | 32 | "movq %%cr3, %0; # flush TLB \n" \ |
| 30 | "movq %0, %%cr3; \n" \ | 33 | "movq %0, %%cr3; \n" \ |
| 31 | "movq %2, %%cr4; # turn PGE back on \n" \ | 34 | "movq %2, %%cr4; # turn PGE back on \n" \ |
| 32 | : "=&r" (tmpreg) \ | 35 | : "=&r" (tmpreg), "=&r" (cr4), "=&r" (cr4_orig) \ |
| 33 | : "r" (mmu_cr4_features & ~X86_CR4_PGE), \ | 36 | : "i" (~X86_CR4_PGE) \ |
| 34 | "r" (mmu_cr4_features) \ | ||
| 35 | : "memory"); \ | 37 | : "memory"); \ |
| 36 | } while (0) | 38 | } while (0) |
| 37 | 39 | ||