leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sh: Kill off the GENERIC_CALIBRATE_DELAY ifndef.

Browse Source 
Now that everyone is using the clock framework directly and we
unconditionally provide our own calibrate_delay() function, having it
wrapped in an ifndef is no longer useful. So, kill it off.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Paul Mundt 2009-05-08 22:14:01 +09:00
parent ccdaeb4c8f
commit 7b551f9daa
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/sh/kernel/setup.c
View File

@ -156,7 +156,7 @@ static void __init reserve_crashkernel(void)
&crash_size, &crash_base); &crash_size, &crash_base);
if (ret == 0 && crash_size) { if (ret == 0 && crash_size) {
if (crash_base <= 0) { if (crash_base <= 0) {
vp = alloc_bootmem_nopanic(crash_size); vp = alloc_bootmem_nopanic(crash_size);
if (!vp) { if (!vp) {
printk(KERN_INFO "crashkernel allocation " printk(KERN_INFO "crashkernel allocation "
"failed\n"); "failed\n");
@ -185,7 +185,6 @@ static inline void __init reserve_crashkernel(void)
{} {}
#endif #endif
#ifndef CONFIG_GENERIC_CALIBRATE_DELAY
void __cpuinit calibrate_delay(void) void __cpuinit calibrate_delay(void)
{ {
struct clk *clk = clk_get(NULL, "cpu_clk"); 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/(5000/HZ)) % 100,
loops_per_jiffy); loops_per_jiffy);
} }
#endif
void __init __add_active_range(unsigned int nid, unsigned long start_pfn, void __init __add_active_range(unsigned int nid, unsigned long start_pfn,
unsigned long end_pfn) unsigned long end_pfn)