diff options
Diffstat (limited to 'arch/arm/kernel')
-rw-r--r-- | arch/arm/kernel/setup.c | 13 | ||||
-rw-r--r-- | arch/arm/kernel/smp.c | 4 |
2 files changed, 15 insertions, 2 deletions
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 7cc11c0..7e51962 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c @@ -49,6 +49,9 @@ #include <asm/mach/time.h> #include <asm/traps.h> #include <asm/unwind.h> +#ifdef CONFIG_MIDAS_COMMON +#include <plat/cpu.h> +#endif #if defined(CONFIG_DEPRECATED_PARAM_STRUCT) #include "compat.h" @@ -75,6 +78,9 @@ __setup("fpe=", fpe_setup); extern void paging_init(struct machine_desc *desc); extern void sanity_check_meminfo(void); extern void reboot_setup(char *str); +#ifdef CONFIG_DMA_CMA +extern void setup_dma_zone(struct machine_desc *desc); +#endif unsigned int processor_id; EXPORT_SYMBOL(processor_id); @@ -887,6 +893,9 @@ void __init setup_arch(char **cmdline_p) machine_desc = mdesc; machine_name = mdesc->name; +#ifdef CONFIG_DMA_CMA + setup_dma_zone(mdesc); +#endif if (mdesc->soft_reboot) reboot_setup("s"); @@ -1041,6 +1050,10 @@ static int c_show(struct seq_file *m, void *v) seq_puts(m, "\n"); +#ifdef CONFIG_MIDAS_COMMON + if (soc_is_exynos4412()) + seq_printf(m, "Chip revision\t: %04x\n", samsung_rev()); +#endif seq_printf(m, "Hardware\t: %s\n", machine_name); seq_printf(m, "Revision\t: %04x\n", system_rev); seq_printf(m, "Serial\t\t: %08x%08x\n", diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c index 6893ec9..ffc8fb6 100644 --- a/arch/arm/kernel/smp.c +++ b/arch/arm/kernel/smp.c @@ -296,8 +296,6 @@ asmlinkage void __cpuinit secondary_start_kernel(void) struct mm_struct *mm = &init_mm; unsigned int cpu = smp_processor_id(); - printk("CPU%u: Booted secondary processor\n", cpu); - /* * All kernel threads share the same mm context; grab a * reference and switch to it. @@ -309,6 +307,8 @@ asmlinkage void __cpuinit secondary_start_kernel(void) enter_lazy_tlb(mm, current); local_flush_tlb_all(); + printk("CPU%u: Booted secondary processor\n", cpu); + cpu_init(); preempt_disable(); trace_hardirqs_off(); |