tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
[MIPS] Fix build breakage due to duplicate cpu_clock definition
commit e436d80085133858bf2613a630365e8a0459fd58
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>
+11
-11
+3
-3
arch/mips/lemote/lm2e/prom.c
+3
-3
arch/mips/lemote/lm2e/prom.c
···
23
23
#include <asm/bootinfo.h>
24
24
25
25
extern unsigned long bus_clock;
26
-
extern unsigned long cpu_clock;
26
+
extern unsigned long cpu_clock_freq;
27
27
extern unsigned int memsize, highmemsize;
28
28
extern int putDebugChar(unsigned char byte);
29
29
···
81
81
l = (long)*env;
82
82
while (l != 0) {
83
83
parse_even_earlier(bus_clock, "busclock", l);
84
-
parse_even_earlier(cpu_clock, "cpuclock", l);
84
+
parse_even_earlier(cpu_clock_freq, "cpuclock", l);
85
85
parse_even_earlier(memsize, "memsize", l);
86
86
parse_even_earlier(highmemsize, "highmemsize", l);
87
87
env++;
···
91
91
memsize = 256;
92
92
93
93
pr_info("busclock=%ld, cpuclock=%ld,memsize=%d,highmemsize=%d\n",
94
-
bus_clock, cpu_clock, memsize, highmemsize);
94
+
bus_clock, cpu_clock_freq, memsize, highmemsize);
95
95
}
96
96
97
97
void __init prom_free_prom_memory(void)
+2
-2
arch/mips/lemote/lm2e/setup.c
+2
-2
arch/mips/lemote/lm2e/setup.c
···
58
58
#define PTR_PAD(p) (p)
59
59
#endif
60
60
61
-
unsigned long cpu_clock;
61
+
unsigned long cpu_clock_freq;
62
62
unsigned long bus_clock;
63
63
unsigned int memsize;
64
64
unsigned int highmemsize = 0;
···
71
71
static void __init loongson2e_time_init(void)
72
72
{
73
73
/* setup mips r4k timer */
74
-
mips_hpt_frequency = cpu_clock / 2;
74
+
mips_hpt_frequency = cpu_clock_freq / 2;
75
75
}
76
76
77
77
static unsigned long __init mips_rtc_get_time(void)
+2
-2
arch/mips/pmc-sierra/yosemite/prom.c
+2
-2
arch/mips/pmc-sierra/yosemite/prom.c
···
34
34
struct callvectors *debug_vectors;
35
35
36
36
extern unsigned long yosemite_base;
37
-
extern unsigned long cpu_clock;
37
+
extern unsigned long cpu_clock_freq;
38
38
39
39
const char *get_system_type(void)
40
40
{
···
119
119
16);
120
120
121
121
if (strncmp("cpuclock", *env, strlen("cpuclock")) == 0)
122
-
cpu_clock =
122
+
cpu_clock_freq =
123
123
simple_strtol(*env + strlen("cpuclock="), NULL,
124
124
10);
125
125
+2
-2
arch/mips/pmc-sierra/yosemite/setup.c
+2
-2
arch/mips/pmc-sierra/yosemite/setup.c
···
59
59
0x00, 0xe0, 0x04, 0x00, 0x00, 0x21
60
60
};
61
61
62
-
unsigned long cpu_clock;
62
+
unsigned long cpu_clock_freq;
63
63
unsigned long yosemite_base;
64
64
65
65
static struct m48t37_rtc *m48t37_base;
···
140
140
141
141
void yosemite_time_init(void)
142
142
{
143
-
mips_hpt_frequency = cpu_clock / 2;
143
+
mips_hpt_frequency = cpu_clock_freq / 2;
144
144
mips_hpt_frequency = 33000000 * 3 * 5;
145
145
}
146
146
+2
-2
arch/mips/tx4938/toshiba_rbtx4938/setup.c
+2
-2
arch/mips/tx4938/toshiba_rbtx4938/setup.c
···
657
657
658
658
/* clocks */
659
659
if (txx9_master_clock) {
660
-
/* calculate gbus_clock and cpu_clock from master_clock */
660
+
/* calculate gbus_clock and cpu_clock_freq from master_clock */
661
661
divmode = (unsigned long)tx4938_ccfgptr->ccfg & TX4938_CCFG_DIVMODE_MASK;
662
662
switch (divmode) {
663
663
case TX4938_CCFG_DIVMODE_8:
···
691
691
if (txx9_cpu_clock == 0) {
692
692
txx9_cpu_clock = 300000000; /* 300MHz */
693
693
}
694
-
/* calculate gbus_clock and master_clock from cpu_clock */
694
+
/* calculate gbus_clock and master_clock from cpu_clock_freq */
695
695
cpuclk = txx9_cpu_clock;
696
696
divmode = (unsigned long)tx4938_ccfgptr->ccfg & TX4938_CCFG_DIVMODE_MASK;
697
697
switch (divmode) {