diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-29 16:32:35 -0500 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-29 16:32:35 -0500 |
| commit | 33edcf133ba93ecba2e4b6472e97b689895d805c (patch) | |
| tree | 327d7a20acef64005e7c5ccbfa1265be28aeb6ac /arch/powerpc/include/asm/mmu-40x.h | |
| parent | be4d638c1597580ed2294d899d9f1a2cd10e462c (diff) | |
| parent | 3c92ec8ae91ecf59d88c798301833d7cf83f2179 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/powerpc/include/asm/mmu-40x.h')
| -rw-r--r-- | arch/powerpc/include/asm/mmu-40x.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/powerpc/include/asm/mmu-40x.h b/arch/powerpc/include/asm/mmu-40x.h index 3d108676584c..776f415a36aa 100644 --- a/arch/powerpc/include/asm/mmu-40x.h +++ b/arch/powerpc/include/asm/mmu-40x.h | |||
| @@ -54,8 +54,9 @@ | |||
| 54 | #ifndef __ASSEMBLY__ | 54 | #ifndef __ASSEMBLY__ |
| 55 | 55 | ||
| 56 | typedef struct { | 56 | typedef struct { |
| 57 | unsigned long id; | 57 | unsigned int id; |
| 58 | unsigned long vdso_base; | 58 | unsigned int active; |
| 59 | unsigned long vdso_base; | ||
| 59 | } mm_context_t; | 60 | } mm_context_t; |
| 60 | 61 | ||
| 61 | #endif /* !__ASSEMBLY__ */ | 62 | #endif /* !__ASSEMBLY__ */ |