Merge remote-tracking branch 'hid/for-next'

[karo-tx-linux.git] / arch / hexagon / kernel / setup.c

diff --git a/arch/hexagon/kernel/setup.c b/arch/hexagon/kernel/setup.c
index 94a38783500870f06945f993e0840fbc01b0cb75..bfe13311d70d5c853f6f6a65e7f41abe753d16ff 100644 (file)
--- a/arch/hexagon/kernel/setup.c
+++ b/arch/hexagon/kernel/setup.c
@@ -1,7 +1,7 @@
 /*
  * Arch related setup for Hexagon
  *
- * Copyright (c) 2010-2011, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2010-2013, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -68,6 +68,8 @@ void __init setup_arch(char **cmdline_p)
         */
        __vmsetvec(_K_VM_event_vector);
 
+       printk(KERN_INFO "PHYS_OFFSET=0x%08x\n", PHYS_OFFSET);
+
        /*
         * Simulator has a few differences from the hardware.
         * For now, check uninitialized-but-mapped memory
@@ -128,6 +130,11 @@ static int show_cpuinfo(struct seq_file *m, void *v)
 {
        int cpu = (unsigned long) v - 1;
 
+#ifdef CONFIG_SMP
+       if (!cpu_online(cpu))
+               return 0;
+#endif
+
        seq_printf(m, "processor\t: %d\n", cpu);
        seq_printf(m, "model name\t: Hexagon Virtual Machine\n");
        seq_printf(m, "BogoMips\t: %lu.%02lu\n",