diff options
| author | Greg KH <greg@press.(none)> | 2005-06-28 01:07:56 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-06-28 01:07:56 -0400 |
| commit | 8644d2a42bdba2d513f71c07eaf1b6f9b718b8eb (patch) | |
| tree | c43b6c2fdf1b68b66906a2de69446dcec0f9af6b /include/asm-i386/tlbflush.h | |
| parent | 1cde8a16815bd85c8137d1ea556398983c597c11 (diff) | |
| parent | 99f95e5286df2f69edab8a04c7080d986ee4233b (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-i386/tlbflush.h')
| -rw-r--r-- | include/asm-i386/tlbflush.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/include/asm-i386/tlbflush.h b/include/asm-i386/tlbflush.h index f22fab0cea26..ab216e1370ef 100644 --- a/include/asm-i386/tlbflush.h +++ b/include/asm-i386/tlbflush.h | |||
| @@ -22,16 +22,18 @@ | |||
| 22 | */ | 22 | */ |
| 23 | #define __flush_tlb_global() \ | 23 | #define __flush_tlb_global() \ |
| 24 | do { \ | 24 | do { \ |
| 25 | unsigned int tmpreg; \ | 25 | unsigned int tmpreg, cr4, cr4_orig; \ |
| 26 | \ | 26 | \ |
| 27 | __asm__ __volatile__( \ | 27 | __asm__ __volatile__( \ |
| 28 | "movl %1, %%cr4; # turn off PGE \n" \ | 28 | "movl %%cr4, %2; # turn off PGE \n" \ |
| 29 | "movl %2, %1; \n" \ | ||
| 30 | "andl %3, %1; \n" \ | ||
| 31 | "movl %1, %%cr4; \n" \ | ||
| 29 | "movl %%cr3, %0; \n" \ | 32 | "movl %%cr3, %0; \n" \ |
| 30 | "movl %0, %%cr3; # flush TLB \n" \ | 33 | "movl %0, %%cr3; # flush TLB \n" \ |
| 31 | "movl %2, %%cr4; # turn PGE back on \n" \ | 34 | "movl %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 | ||