diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2005-12-07 19:32:23 -0500 |
---|---|---|
committer | <ralf@denk.linux-mips.net> | 2006-01-10 08:39:06 -0500 |
commit | 571e0bed85470882cedfb100e847902911c3f4d2 (patch) | |
tree | 1afe6f255bef4c2e78ae382a8dd3a14e56028e99 /arch/mips/kernel/vpe.c | |
parent | b2d28b7ea57edb4dee34a70fcd89083134017d4d (diff) |
MIPS: MT: Fix 32-bit dependencies.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/kernel/vpe.c')
-rw-r--r-- | arch/mips/kernel/vpe.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c index 9c89eebc356f..ae83b755cf4a 100644 --- a/arch/mips/kernel/vpe.c +++ b/arch/mips/kernel/vpe.c | |||
@@ -99,9 +99,9 @@ struct vpe { | |||
99 | 99 | ||
100 | /* elfloader stuff */ | 100 | /* elfloader stuff */ |
101 | void *load_addr; | 101 | void *load_addr; |
102 | u32 len; | 102 | unsigned long len; |
103 | char *pbuffer; | 103 | char *pbuffer; |
104 | u32 plen; | 104 | unsigned long plen; |
105 | 105 | ||
106 | unsigned long __start; | 106 | unsigned long __start; |
107 | 107 | ||
@@ -253,11 +253,11 @@ void dump_mtregs(void) | |||
253 | } | 253 | } |
254 | 254 | ||
255 | /* Find some VPE program space */ | 255 | /* Find some VPE program space */ |
256 | static void *alloc_progmem(u32 len) | 256 | static void *alloc_progmem(unsigned long len) |
257 | { | 257 | { |
258 | #ifdef CONFIG_MIPS_VPE_LOADER_TOM | 258 | #ifdef CONFIG_MIPS_VPE_LOADER_TOM |
259 | /* this means you must tell linux to use less memory than you physically have */ | 259 | /* this means you must tell linux to use less memory than you physically have */ |
260 | return (void *)((max_pfn * PAGE_SIZE) + KSEG0); | 260 | return pfn_to_kaddr(max_pfn); |
261 | #else | 261 | #else |
262 | // simple grab some mem for now | 262 | // simple grab some mem for now |
263 | return kmalloc(len, GFP_KERNEL); | 263 | return kmalloc(len, GFP_KERNEL); |