Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / arch / mips / dec / prom / memory.c

diff --git a/arch/mips/dec/prom/memory.c b/arch/mips/dec/prom/memory.c
index e4f6f26..1edaf30 100644 (file)
--- a/arch/mips/dec/prom/memory.c
+++ b/arch/mips/dec/prom/memory.c
@@ -35,22 +35,22 @@ static inline void pmax_setup_memory_region(void)
        extern char genexcept_early;
 
        /* Install exception handler */
-       memcpy(&old_handler, (void *)(KSEG0 + 0x80), 0x80);
-       memcpy((void *)(KSEG0 + 0x80), &genexcept_early, 0x80);
+       memcpy(&old_handler, (void *)(CKSEG0 + 0x80), 0x80);
+       memcpy((void *)(CKSEG0 + 0x80), &genexcept_early, 0x80);
 
        /* read unmapped and uncached (KSEG1)
         * DECstations have at least 4MB RAM
         * Assume less than 480MB of RAM, as this is max for 5000/2xx
         * FIXME this should be replaced by the first free page!
         */
-       for (memory_page = (unsigned char *) KSEG1 + CHUNK_SIZE;
-            (mem_err== 0) && (memory_page < ((unsigned char *) KSEG1+0x1E000000));
-            memory_page += CHUNK_SIZE) {
+       for (memory_page = (unsigned char *)CKSEG1 + CHUNK_SIZE;
+            mem_err == 0 && memory_page < (unsigned char *)CKSEG1 + 0x1e00000;
+            memory_page += CHUNK_SIZE) {
                dummy = *memory_page;
        }
-       memcpy((void *)(KSEG0 + 0x80), &old_handler, 0x80);
+       memcpy((void *)(CKSEG0 + 0x80), &old_handler, 0x80);
 
-       add_memory_region(0, (unsigned long)memory_page - KSEG1 - CHUNK_SIZE,
+       add_memory_region(0, (unsigned long)memory_page - CKSEG1 - CHUNK_SIZE,
                          BOOT_MEM_RAM);
 }
 
@@ -65,7 +65,7 @@ static inline void rex_setup_memory_region(void)
        memmap *bm;
 
        /* some free 64k */
-       bm = (memmap *)KSEG0ADDR(0x28000);
+       bm = (memmap *)CKSEG0ADDR(0x28000);
 
        bitmap_size = rex_getbitmap(bm);
 
@@ -118,7 +118,7 @@ unsigned long __init prom_free_prom_memory(void)
        addr = PAGE_SIZE;
        while (addr < end) {
                ClearPageReserved(virt_to_page(__va(addr)));
-               set_page_count(virt_to_page(__va(addr)), 1);
+               init_page_count(virt_to_page(__va(addr)));
                free_page((unsigned long)__va(addr));
                addr += PAGE_SIZE;
        }