diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-20 03:02:39 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-20 03:02:39 -0500 |
| commit | fbc2a06056c9aa3cb8c44bf1cfeb1d260e229e5c (patch) | |
| tree | feb2a1c13ad3dff5a8c7ab3c0265e8eca7a0c5a3 /arch/cris/arch-v32/mm/tlb.c | |
| parent | a3d732f93785da17e0137210deadb4616f5536fc (diff) | |
| parent | ee2f6cc7f9ea2542ad46070ed62ba7aa04d08871 (diff) | |
Merge branch 'linus' into x86/uv
Diffstat (limited to 'arch/cris/arch-v32/mm/tlb.c')
| -rw-r--r-- | arch/cris/arch-v32/mm/tlb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/cris/arch-v32/mm/tlb.c b/arch/cris/arch-v32/mm/tlb.c index eda5ebcaea54..55ade36fe8a8 100644 --- a/arch/cris/arch-v32/mm/tlb.c +++ b/arch/cris/arch-v32/mm/tlb.c | |||
| @@ -9,8 +9,8 @@ | |||
| 9 | 9 | ||
| 10 | #include <asm/tlb.h> | 10 | #include <asm/tlb.h> |
| 11 | #include <asm/mmu_context.h> | 11 | #include <asm/mmu_context.h> |
| 12 | #include <asm/arch/hwregs/asm/mmu_defs_asm.h> | 12 | #include <arch/hwregs/asm/mmu_defs_asm.h> |
| 13 | #include <asm/arch/hwregs/supp_reg.h> | 13 | #include <arch/hwregs/supp_reg.h> |
| 14 | 14 | ||
| 15 | #define UPDATE_TLB_SEL_IDX(val) \ | 15 | #define UPDATE_TLB_SEL_IDX(val) \ |
| 16 | do { \ | 16 | do { \ |