linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / sh / kernel / setup.c

diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c
index b368a69..6b0d603 100644 (file)
--- a/arch/sh/kernel/setup.c
+++ b/arch/sh/kernel/setup.c
@@ -10,7 +10,7 @@
  * This file handles the architecture-dependent parts of initialization
  */
 
-#include <linux/screen_info.h>
+#include <linux/tty.h>
 #include <linux/ioport.h>
 #include <linux/init.h>
 #include <linux/initrd.h>
@@ -20,7 +20,6 @@
 #include <linux/root_dev.h>
 #include <linux/utsname.h>
 #include <linux/cpu.h>
-#include <linux/pfn.h>
 #include <linux/vs_cvirt.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
@@ -277,6 +276,10 @@ void __init setup_arch(char **cmdline_p)
 
        sh_mv_setup(cmdline_p);
 
+#define PFN_UP(x)      (((x) + PAGE_SIZE-1) >> PAGE_SHIFT)
+#define PFN_DOWN(x)    ((x) >> PAGE_SHIFT)
+#define PFN_PHYS(x)    ((x) << PAGE_SHIFT)
+
        /*
         * Find the highest page frame number we have available
         */
@@ -402,8 +405,9 @@ static int __init topology_init(void)
 {
        int cpu_id;
 
-       for_each_possible_cpu(cpu_id)
-               register_cpu(&cpu[cpu_id], cpu_id);
+       for (cpu_id = 0; cpu_id < NR_CPUS; cpu_id++)
+               if (cpu_possible(cpu_id))
+                       register_cpu(&cpu[cpu_id], cpu_id, NULL);
 
        return 0;
 }