[MIPS] Fix build breakage due to duplicate cpu_clock definition
commit e436d80085
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Jul 19 21:28:35 2007 +0200
[PATCH] sched: implement cpu_clock(cpu) high-speed time source
broke the build of several MIPS platforms which were already using the
symbol cpu_clock for the own purposes.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
@@ -34,7 +34,7 @@ extern void prom_grab_secondary(void);
|
||||
struct callvectors *debug_vectors;
|
||||
|
||||
extern unsigned long yosemite_base;
|
||||
extern unsigned long cpu_clock;
|
||||
extern unsigned long cpu_clock_freq;
|
||||
|
||||
const char *get_system_type(void)
|
||||
{
|
||||
@@ -119,7 +119,7 @@ void __init prom_init(void)
|
||||
16);
|
||||
|
||||
if (strncmp("cpuclock", *env, strlen("cpuclock")) == 0)
|
||||
cpu_clock =
|
||||
cpu_clock_freq =
|
||||
simple_strtol(*env + strlen("cpuclock="), NULL,
|
||||
10);
|
||||
|
||||
|
@@ -59,7 +59,7 @@ unsigned char titan_ge_mac_addr_base[6] = {
|
||||
0x00, 0xe0, 0x04, 0x00, 0x00, 0x21
|
||||
};
|
||||
|
||||
unsigned long cpu_clock;
|
||||
unsigned long cpu_clock_freq;
|
||||
unsigned long yosemite_base;
|
||||
|
||||
static struct m48t37_rtc *m48t37_base;
|
||||
@@ -140,7 +140,7 @@ void __init plat_timer_setup(struct irqaction *irq)
|
||||
|
||||
void yosemite_time_init(void)
|
||||
{
|
||||
mips_hpt_frequency = cpu_clock / 2;
|
||||
mips_hpt_frequency = cpu_clock_freq / 2;
|
||||
mips_hpt_frequency = 33000000 * 3 * 5;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user