diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-08 14:23:02 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-08 14:23:02 -0500 |
| commit | 895e031707954a9ca26ed4f5f794575313854ed1 (patch) | |
| tree | ec7cd5515f346e6f94bc43e63d55ebc8ddf4173d /arch/cris/arch-v32/mm/tlb.c | |
| parent | 838e8bb71dc0c892bf8f84abd3c709d8fe3a8d3c (diff) | |
| parent | a622cf69b806bbb1887913c04e01d0c25b892876 (diff) | |
Merge branch 'linus' into x86/cleanups
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 { \ |