diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-28 17:32:00 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-28 17:32:00 -0400 |
| commit | 9e3ee1c39c0cc71222f9980ccbf87fe072897eef (patch) | |
| tree | 99462000e6f0d4f907cb2fc690f19d4d441ba0f3 /include/asm-sh/mmu_context.h | |
| parent | e56b3bc7942982ac2589c942fb345e38bc7a341a (diff) | |
| parent | f934fb19ef34730263e6afc01e8ec27a8a71470f (diff) | |
Merge branch 'linus' into cpus4096
Conflicts:
kernel/stop_machine.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-sh/mmu_context.h')
| -rw-r--r-- | include/asm-sh/mmu_context.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-sh/mmu_context.h b/include/asm-sh/mmu_context.h index 87e812f68bb..8589a50febd 100644 --- a/include/asm-sh/mmu_context.h +++ b/include/asm-sh/mmu_context.h | |||
| @@ -27,8 +27,9 @@ | |||
| 27 | /* ASID is 8-bit value, so it can't be 0x100 */ | 27 | /* ASID is 8-bit value, so it can't be 0x100 */ |
| 28 | #define MMU_NO_ASID 0x100 | 28 | #define MMU_NO_ASID 0x100 |
| 29 | 29 | ||
| 30 | #ifdef CONFIG_MMU | ||
| 31 | #define asid_cache(cpu) (cpu_data[cpu].asid_cache) | 30 | #define asid_cache(cpu) (cpu_data[cpu].asid_cache) |
| 31 | |||
| 32 | #ifdef CONFIG_MMU | ||
| 32 | #define cpu_context(cpu, mm) ((mm)->context.id[cpu]) | 33 | #define cpu_context(cpu, mm) ((mm)->context.id[cpu]) |
| 33 | 34 | ||
| 34 | #define cpu_asid(cpu, mm) \ | 35 | #define cpu_asid(cpu, mm) \ |