Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 7 insertions, 161 deletions

diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c
index e769401a78ba..58bff45d1156 100644
--- a/arch/sh/kernel/setup.c
+++ b/arch/sh/kernel/setup.c
@@ -12,7 +12,6 @@
 #include <linux/initrd.h>
 #include <linux/bootmem.h>
 #include <linux/console.h>
-#include <linux/seq_file.h>
 #include <linux/root_dev.h>
 #include <linux/utsname.h>
 #include <linux/nodemask.h>
@@ -24,7 +23,6 @@
 #include <linux/module.h>
 #include <linux/smp.h>
 #include <linux/err.h>
-#include <linux/debugfs.h>
 #include <linux/crash_dump.h>
 #include <linux/mmzone.h>
 #include <linux/clk.h>
@@ -42,6 +40,7 @@
 #include <asm/smp.h>
 #include <asm/mmu_context.h>
 #include <asm/mmzone.h>
+#include <asm/sparsemem.h>
 
 /*
  * Initialize loops_per_jiffy as 10000000 (1000MIPS).
@@ -53,6 +52,7 @@ struct sh_cpuinfo cpu_data[NR_CPUS] __read_mostly = {
                 .type                   = CPU_SH_NONE,
                 .family                 = CPU_FAMILY_UNKNOWN,
                 .loops_per_jiffy        = 10000000,
+                .phys_bits              = MAX_PHYSMEM_BITS,
         },
 };
 EXPORT_SYMBOL(cpu_data);
@@ -136,8 +136,9 @@ void __init check_for_initrd(void)
                 goto disable;
         }
 
-        if (unlikely(start < PAGE_OFFSET)) {
-                pr_err("initrd start < PAGE_OFFSET\n");
+        if (unlikely(start < __MEMORY_START)) {
+                pr_err("initrd start (%08lx) < __MEMORY_START(%x)\n",
+                        start, __MEMORY_START);
                 goto disable;
         }
 
@@ -149,7 +150,7 @@ void __init check_for_initrd(void)
         }
 
         /*
-         * If we got this far inspite of the boot loader's best efforts
+         * If we got this far in spite of the boot loader's best efforts
          * to the contrary, assume we actually have a valid initrd and
          * fix up the root dev.
          */
@@ -158,7 +159,7 @@ void __init check_for_initrd(void)
         /*
          * Address sanitization
          */
-        initrd_start = (unsigned long)__va(__pa(start));
+        initrd_start = (unsigned long)__va(start);
         initrd_end = initrd_start + INITRD_SIZE;
 
         memblock_reserve(__pa(initrd_start), INITRD_SIZE);
@@ -317,158 +318,3 @@ int test_mode_pin(int pin)
 {
         return sh_mv.mv_mode_pins() & pin;
 }
-
-static const char *cpu_name[] = {
-        [CPU_SH7201]    = "SH7201",
-        [CPU_SH7203]    = "SH7203",     [CPU_SH7263]    = "SH7263",
-        [CPU_SH7206]    = "SH7206",     [CPU_SH7619]    = "SH7619",
-        [CPU_SH7705]    = "SH7705",     [CPU_SH7706]    = "SH7706",
-        [CPU_SH7707]    = "SH7707",     [CPU_SH7708]    = "SH7708",
-        [CPU_SH7709]    = "SH7709",     [CPU_SH7710]    = "SH7710",
-        [CPU_SH7712]    = "SH7712",     [CPU_SH7720]    = "SH7720",
-        [CPU_SH7721]    = "SH7721",     [CPU_SH7729]    = "SH7729",
-        [CPU_SH7750]    = "SH7750",     [CPU_SH7750S]   = "SH7750S",
-        [CPU_SH7750R]   = "SH7750R",    [CPU_SH7751]    = "SH7751",
-        [CPU_SH7751R]   = "SH7751R",    [CPU_SH7760]    = "SH7760",
-        [CPU_SH4_202]   = "SH4-202",    [CPU_SH4_501]   = "SH4-501",
-        [CPU_SH7763]    = "SH7763",     [CPU_SH7770]    = "SH7770",
-        [CPU_SH7780]    = "SH7780",     [CPU_SH7781]    = "SH7781",
-        [CPU_SH7343]    = "SH7343",     [CPU_SH7785]    = "SH7785",
-        [CPU_SH7786]    = "SH7786",     [CPU_SH7757]    = "SH7757",
-        [CPU_SH7722]    = "SH7722",     [CPU_SHX3]      = "SH-X3",
-        [CPU_SH5_101]   = "SH5-101",    [CPU_SH5_103]   = "SH5-103",
-        [CPU_MXG]       = "MX-G",       [CPU_SH7723]    = "SH7723",
-        [CPU_SH7366]    = "SH7366",     [CPU_SH7724]    = "SH7724",
-        [CPU_SH_NONE]   = "Unknown"
-};
-
-const char *get_cpu_subtype(struct sh_cpuinfo *c)
-{
-        return cpu_name[c->type];
-}
-EXPORT_SYMBOL(get_cpu_subtype);
-
-#ifdef CONFIG_PROC_FS
-/* Symbolic CPU flags, keep in sync with asm/cpu-features.h */
-static const char *cpu_flags[] = {
-        "none", "fpu", "p2flush", "mmuassoc", "dsp", "perfctr",
-        "ptea", "llsc", "l2", "op32", "pteaex", NULL
-};
-
-static void show_cpuflags(struct seq_file *m, struct sh_cpuinfo *c)
-{
-        unsigned long i;
-
-        seq_printf(m, "cpu flags\t:");
-
-        if (!c->flags) {
-                seq_printf(m, " %s\n", cpu_flags[0]);
-                return;
-        }
-
-        for (i = 0; cpu_flags[i]; i++)
-                if ((c->flags & (1 << i)))
-                        seq_printf(m, " %s", cpu_flags[i+1]);
-
-        seq_printf(m, "\n");
-}
-
-static void show_cacheinfo(struct seq_file *m, const char *type,
-                           struct cache_info info)
-{
-        unsigned int cache_size;
-
-        cache_size = info.ways * info.sets * info.linesz;
-
-        seq_printf(m, "%s size\t: %2dKiB (%d-way)\n",
-                   type, cache_size >> 10, info.ways);
-}
-
-/*
- *      Get CPU information for use by the procfs.
- */
-static int show_cpuinfo(struct seq_file *m, void *v)
-{
-        struct sh_cpuinfo *c = v;
-        unsigned int cpu = c - cpu_data;
-
-        if (!cpu_online(cpu))
-                return 0;
-
-        if (cpu == 0)
-                seq_printf(m, "machine\t\t: %s\n", get_system_type());
-        else
-                seq_printf(m, "\n");
-
-        seq_printf(m, "processor\t: %d\n", cpu);
-        seq_printf(m, "cpu family\t: %s\n", init_utsname()->machine);
-        seq_printf(m, "cpu type\t: %s\n", get_cpu_subtype(c));
-        if (c->cut_major == -1)
-                seq_printf(m, "cut\t\t: unknown\n");
-        else if (c->cut_minor == -1)
-                seq_printf(m, "cut\t\t: %d.x\n", c->cut_major);
-        else
-                seq_printf(m, "cut\t\t: %d.%d\n", c->cut_major, c->cut_minor);
-
-        show_cpuflags(m, c);
-
-        seq_printf(m, "cache type\t: ");
-
-        /*
-         * Check for what type of cache we have, we support both the
-         * unified cache on the SH-2 and SH-3, as well as the harvard
-         * style cache on the SH-4.
-         */
-        if (c->icache.flags & SH_CACHE_COMBINED) {
-                seq_printf(m, "unified\n");
-                show_cacheinfo(m, "cache", c->icache);
-        } else {
-                seq_printf(m, "split (harvard)\n");
-                show_cacheinfo(m, "icache", c->icache);
-                show_cacheinfo(m, "dcache", c->dcache);
-        }
-
-        /* Optional secondary cache */
-        if (c->flags & CPU_HAS_L2_CACHE)
-                show_cacheinfo(m, "scache", c->scache);
-
-        seq_printf(m, "bogomips\t: %lu.%02lu\n",
-                     c->loops_per_jiffy/(500000/HZ),
-                     (c->loops_per_jiffy/(5000/HZ)) % 100);
-
-        return 0;
-}
-
-static void *c_start(struct seq_file *m, loff_t *pos)
-{
-        return *pos < NR_CPUS ? cpu_data + *pos : NULL;
-}
-static void *c_next(struct seq_file *m, void *v, loff_t *pos)
-{
-        ++*pos;
-        return c_start(m, pos);
-}
-static void c_stop(struct seq_file *m, void *v)
-{
-}
-const struct seq_operations cpuinfo_op = {
-        .start  = c_start,
-        .next   = c_next,
-        .stop   = c_stop,
-        .show   = show_cpuinfo,
-};
-#endif /* CONFIG_PROC_FS */
-
-struct dentry *sh_debugfs_root;
-
-static int __init sh_debugfs_init(void)
-{
-        sh_debugfs_root = debugfs_create_dir("sh", NULL);
-        if (!sh_debugfs_root)
-                return -ENOMEM;
-        if (IS_ERR(sh_debugfs_root))
-                return PTR_ERR(sh_debugfs_root);
-
-        return 0;
-}
-arch_initcall(sh_debugfs_init);