diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-04-21 03:47:00 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-04-21 03:47:05 -0400 |
| commit | ac0053fd51d2bac09a7d4b4a59f6dac863bd4373 (patch) | |
| tree | 00c32e14428853f352fa3828d0131653ad6a7c69 /arch/mips/include/asm/mmu.h | |
| parent | b15c7b1cee119999e9eafcd602d24a595e77adac (diff) | |
| parent | 01bf0b64579ead8a82e7cfc32ae44bc667e7ad0f (diff) | |
Merge commit 'v2.6.34-rc5' into tracing/core
Merge reason: pick up latest -rc's.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/mips/include/asm/mmu.h')
| -rw-r--r-- | arch/mips/include/asm/mmu.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/mips/include/asm/mmu.h b/arch/mips/include/asm/mmu.h index 4063edd79623..c436138945a8 100644 --- a/arch/mips/include/asm/mmu.h +++ b/arch/mips/include/asm/mmu.h | |||
| @@ -1,6 +1,9 @@ | |||
| 1 | #ifndef __ASM_MMU_H | 1 | #ifndef __ASM_MMU_H |
| 2 | #define __ASM_MMU_H | 2 | #define __ASM_MMU_H |
| 3 | 3 | ||
| 4 | typedef unsigned long mm_context_t[NR_CPUS]; | 4 | typedef struct { |
| 5 | unsigned long asid[NR_CPUS]; | ||
| 6 | void *vdso; | ||
| 7 | } mm_context_t; | ||
| 5 | 8 | ||
| 6 | #endif /* __ASM_MMU_H */ | 9 | #endif /* __ASM_MMU_H */ |