sparc32: fix build with leon or floppy enabled

[deliverable/linux.git] / arch / sparc / kernel / leon_smp.c

diff --git a/arch/sparc/kernel/leon_smp.c b/arch/sparc/kernel/leon_smp.c
index e9df87f4447f172df5ec69360249a5d0d1feba12..8f5de4aa3c0ab2b8b7cd8c1fad1cf8636f4cb9fa 100644 (file)
--- a/arch/sparc/kernel/leon_smp.c
+++ b/arch/sparc/kernel/leon_smp.c
@@ -41,6 +41,8 @@
 #include <asm/leon.h>
 #include <asm/leon_amba.h>
 
+#include "kernel.h"
+
 #ifdef CONFIG_SPARC_LEON
 
 #include "irq.h"
@@ -261,23 +263,23 @@ void __init leon_smp_done(void)
 
        /* Free unneeded trap tables */
        if (!cpu_isset(1, cpu_present_map)) {
-               ClearPageReserved(virt_to_page(trapbase_cpu1));
-               init_page_count(virt_to_page(trapbase_cpu1));
-               free_page((unsigned long)trapbase_cpu1);
+               ClearPageReserved(virt_to_page(&trapbase_cpu1));
+               init_page_count(virt_to_page(&trapbase_cpu1));
+               free_page((unsigned long)&trapbase_cpu1);
                totalram_pages++;
                num_physpages++;
        }
        if (!cpu_isset(2, cpu_present_map)) {
-               ClearPageReserved(virt_to_page(trapbase_cpu2));
-               init_page_count(virt_to_page(trapbase_cpu2));
-               free_page((unsigned long)trapbase_cpu2);
+               ClearPageReserved(virt_to_page(&trapbase_cpu2));
+               init_page_count(virt_to_page(&trapbase_cpu2));
+               free_page((unsigned long)&trapbase_cpu2);
                totalram_pages++;
                num_physpages++;
        }
        if (!cpu_isset(3, cpu_present_map)) {
-               ClearPageReserved(virt_to_page(trapbase_cpu3));
-               init_page_count(virt_to_page(trapbase_cpu3));
-               free_page((unsigned long)trapbase_cpu3);
+               ClearPageReserved(virt_to_page(&trapbase_cpu3));
+               init_page_count(virt_to_page(&trapbase_cpu3));
+               free_page((unsigned long)&trapbase_cpu3);
                totalram_pages++;
                num_physpages++;
        }