From 9063e18acac32b927a2244cb258dcea46317bf14 Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Fri, 8 May 2009 22:14:01 +0900 Subject: [PATCH] --- yaml --- r: 146739 b: refs/heads/master c: 7b551f9daa9bd9533ba4ce31622ed4be1dd97d3e h: refs/heads/master i: 146737: 3c53971abd009e7b75722acaa63d39714406363b 146735: 050594e1bef9b70ea0396ac29bf09593a564972b v: v3 --- [refs] | 2 +- trunk/arch/sh/kernel/setup.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index aa03569e3bf7..8a95cb13f018 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ccdaeb4c8f982900a2abf722e34b60131394d8eb +refs/heads/master: 7b551f9daa9bd9533ba4ce31622ed4be1dd97d3e diff --git a/trunk/arch/sh/kernel/setup.c b/trunk/arch/sh/kernel/setup.c index 38515a795920..00086b234278 100644 --- a/trunk/arch/sh/kernel/setup.c +++ b/trunk/arch/sh/kernel/setup.c @@ -156,7 +156,7 @@ static void __init reserve_crashkernel(void) &crash_size, &crash_base); if (ret == 0 && crash_size) { if (crash_base <= 0) { - vp = alloc_bootmem_nopanic(crash_size); + vp = alloc_bootmem_nopanic(crash_size); if (!vp) { printk(KERN_INFO "crashkernel allocation " "failed\n"); @@ -185,7 +185,6 @@ static inline void __init reserve_crashkernel(void) {} #endif -#ifndef CONFIG_GENERIC_CALIBRATE_DELAY void __cpuinit calibrate_delay(void) { struct clk *clk = clk_get(NULL, "cpu_clk"); @@ -201,7 +200,6 @@ void __cpuinit calibrate_delay(void) (loops_per_jiffy/(5000/HZ)) % 100, loops_per_jiffy); } -#endif void __init __add_active_range(unsigned int nid, unsigned long start_pfn, unsigned long end_pfn)