Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 348c913f authored by Ralf Baechle's avatar Ralf Baechle
Browse files

[MIPS] Fix build breakage due to duplicate cpu_clock definition 



commit e436d800
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: default avatarRalf Baechle <ralf@linux-mips.org>
parent 3266c6a9

arch/mips/lemote/lm2e/prom.c

+3 −3
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include <asm/bootinfo.h>



extern unsigned long bus_clock;

extern unsigned long cpu_clock;

extern unsigned long cpu_clock_freq;

extern unsigned int memsize, highmemsize;

extern int putDebugChar(unsigned char byte);
@@ -81,7 +81,7 @@ do { \ 
	l = (long)*env;

	while (l != 0) {

		parse_even_earlier(bus_clock, "busclock", l);

		parse_even_earlier(cpu_clock, "cpuclock", l);

		parse_even_earlier(cpu_clock_freq, "cpuclock", l);

		parse_even_earlier(memsize, "memsize", l);

		parse_even_earlier(highmemsize, "highmemsize", l);

		env++;
@@ -91,7 +91,7 @@ do { \ 
		memsize = 256;



	pr_info("busclock=%ld, cpuclock=%ld,memsize=%d,highmemsize=%d\n",

	       bus_clock, cpu_clock, memsize, highmemsize);

	       bus_clock, cpu_clock_freq, memsize, highmemsize);

}



void __init prom_free_prom_memory(void)

arch/mips/lemote/lm2e/setup.c

+2 −2
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ extern void mips_reboot_setup(void); 
#define PTR_PAD(p) (p)

#endif



unsigned long cpu_clock;

unsigned long cpu_clock_freq;

unsigned long bus_clock;

unsigned int memsize;

unsigned int highmemsize = 0;
@@ -71,7 +71,7 @@ void __init plat_timer_setup(struct irqaction *irq) 
static void __init loongson2e_time_init(void)

{

	/* setup mips r4k timer */

	mips_hpt_frequency = cpu_clock / 2;

	mips_hpt_frequency = cpu_clock_freq / 2;

}



static unsigned long __init mips_rtc_get_time(void)

arch/mips/pmc-sierra/yosemite/prom.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

arch/mips/pmc-sierra/yosemite/setup.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

}

arch/mips/tx4938/toshiba_rbtx4938/setup.c

+2 −2
Original line number Diff line number Diff line
@@ -657,7 +657,7 @@ void __init tx4938_board_setup(void) 


	/* clocks */

	if (txx9_master_clock) {

		/* calculate gbus_clock and cpu_clock from master_clock */

		/* calculate gbus_clock and cpu_clock_freq from master_clock */

		divmode = (unsigned long)tx4938_ccfgptr->ccfg & TX4938_CCFG_DIVMODE_MASK;

		switch (divmode) {

		case TX4938_CCFG_DIVMODE_8:
@@ -691,7 +691,7 @@ void __init tx4938_board_setup(void) 
		if (txx9_cpu_clock == 0) {

			txx9_cpu_clock = 300000000;	/* 300MHz */

		}

		/* calculate gbus_clock and master_clock from cpu_clock */

		/* calculate gbus_clock and master_clock from cpu_clock_freq */

		cpuclk = txx9_cpu_clock;

		divmode = (unsigned long)tx4938_ccfgptr->ccfg & TX4938_CCFG_DIVMODE_MASK;

		switch (divmode) {