[PATCH] mips: clean up 32/64-bit configuration
Start cleaning 32-bit vs. 64-bit configuration. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
committed by
Linus Torvalds
parent
63fb6fd1c8
commit
875d43e72b
@@ -96,7 +96,7 @@ static void __init kmap_init(void)
|
||||
kmap_prot = PAGE_KERNEL;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_MIPS64
|
||||
#ifdef CONFIG_64BIT
|
||||
static void __init fixrange_init(unsigned long start, unsigned long end,
|
||||
pgd_t *pgd_base)
|
||||
{
|
||||
@@ -125,7 +125,7 @@ static void __init fixrange_init(unsigned long start, unsigned long end,
|
||||
j = 0;
|
||||
}
|
||||
}
|
||||
#endif /* CONFIG_MIPS64 */
|
||||
#endif /* CONFIG_64BIT */
|
||||
#endif /* CONFIG_HIGHMEM */
|
||||
|
||||
#ifndef CONFIG_NEED_MULTIPLE_NODES
|
||||
@@ -258,7 +258,7 @@ void __init mem_init(void)
|
||||
#ifdef CONFIG_BLK_DEV_INITRD
|
||||
void free_initrd_mem(unsigned long start, unsigned long end)
|
||||
{
|
||||
#ifdef CONFIG_MIPS64
|
||||
#ifdef CONFIG_64BIT
|
||||
/* Switch from KSEG0 to XKPHYS addresses */
|
||||
start = (unsigned long)phys_to_virt(CPHYSADDR(start));
|
||||
end = (unsigned long)phys_to_virt(CPHYSADDR(end));
|
||||
@@ -286,7 +286,7 @@ void free_initmem(void)
|
||||
|
||||
addr = (unsigned long) &__init_begin;
|
||||
while (addr < (unsigned long) &__init_end) {
|
||||
#ifdef CONFIG_MIPS64
|
||||
#ifdef CONFIG_64BIT
|
||||
page = PAGE_OFFSET | CPHYSADDR(addr);
|
||||
#else
|
||||
page = addr;
|
||||
|
Reference in New Issue
Block a user