diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-28 18:07:55 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-28 18:07:55 -0400 |
commit | cb28a1bbdb4790378e7366d6c9ee1d2340b84f92 (patch) | |
tree | 316436f77dac75335fd2c3ef5f109e71606c50d3 /arch/m68k/sun3/mmu_emu.c | |
parent | b6d4f7e3ef25beb8c658c97867d98883e69dc544 (diff) | |
parent | f934fb19ef34730263e6afc01e8ec27a8a71470f (diff) |
Merge branch 'linus' into core/generic-dma-coherent
Conflicts:
arch/x86/Kconfig
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/m68k/sun3/mmu_emu.c')
-rw-r--r-- | arch/m68k/sun3/mmu_emu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/sun3/mmu_emu.c b/arch/m68k/sun3/mmu_emu.c index fb0f6a20cc3c..60f9d4500d72 100644 --- a/arch/m68k/sun3/mmu_emu.c +++ b/arch/m68k/sun3/mmu_emu.c | |||
@@ -55,7 +55,7 @@ unsigned char pmeg_ctx[PMEGS_NUM]; | |||
55 | 55 | ||
56 | /* pointers to the mm structs for each task in each | 56 | /* pointers to the mm structs for each task in each |
57 | context. 0xffffffff is a marker for kernel context */ | 57 | context. 0xffffffff is a marker for kernel context */ |
58 | struct mm_struct *ctx_alloc[CONTEXTS_NUM] = { | 58 | static struct mm_struct *ctx_alloc[CONTEXTS_NUM] = { |
59 | [0] = (struct mm_struct *)0xffffffff | 59 | [0] = (struct mm_struct *)0xffffffff |
60 | }; | 60 | }; |
61 | 61 | ||