From 348c913f571dc1a0e7fd84d7206fc7ee983420df Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Sat, 28 Jul 2007 11:46:15 +0100 Subject: [MIPS] Fix build breakage due to duplicate cpu_clock definition commit e436d80085133858bf2613a630365e8a0459fd58 Author: Ingo Molnar 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 --- arch/mips/lemote/lm2e/prom.c | 6 +++--- arch/mips/lemote/lm2e/setup.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'arch/mips/lemote') diff --git a/arch/mips/lemote/lm2e/prom.c b/arch/mips/lemote/lm2e/prom.c index 67312d7acf2a..4e3132e47bee 100644 --- a/arch/mips/lemote/lm2e/prom.c +++ b/arch/mips/lemote/lm2e/prom.c @@ -23,7 +23,7 @@ #include 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) diff --git a/arch/mips/lemote/lm2e/setup.c b/arch/mips/lemote/lm2e/setup.c index 0e4d1fa572b5..dbb801678fd9 100644 --- a/arch/mips/lemote/lm2e/setup.c +++ b/arch/mips/lemote/lm2e/setup.c @@ -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) -- cgit v1.2.2 From dde96ca8b398637e2b4442e312723f66fa6a8186 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Mon, 30 Jul 2007 11:48:58 +0100 Subject: [MIPS] Use -Werror on subdirectories which build cleanly. Signed-off-by: Ralf Baechle --- arch/mips/lemote/lm2e/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'arch/mips/lemote') diff --git a/arch/mips/lemote/lm2e/Makefile b/arch/mips/lemote/lm2e/Makefile index fb1b48c48cb3..dcaf6f4c3a37 100644 --- a/arch/mips/lemote/lm2e/Makefile +++ b/arch/mips/lemote/lm2e/Makefile @@ -3,5 +3,6 @@ # obj-y += setup.o prom.o reset.o irq.o pci.o bonito-irq.o dbg_io.o mem.o -EXTRA_AFLAGS := $(CFLAGS) +EXTRA_AFLAGS := $(CFLAGS) +EXTRA_CFLAGS += -Werror -- cgit v1.2.2 From 05014a1e56c423254338a1c2e63aab99c84bee9b Mon Sep 17 00:00:00 2001 From: Jesper Juhl Date: Sun, 29 Jul 2007 23:59:35 +0200 Subject: [MIPS] remove some duplicate includes This patch removes some duplicate includes from arch/mips/ Signed-off-by: Jesper Juhl Signed-off-by: Ralf Baechle --- arch/mips/lemote/lm2e/irq.c | 1 - 1 file changed, 1 deletion(-) (limited to 'arch/mips/lemote') diff --git a/arch/mips/lemote/lm2e/irq.c b/arch/mips/lemote/lm2e/irq.c index 05693bceaeaf..3e0b7beb1009 100644 --- a/arch/mips/lemote/lm2e/irq.c +++ b/arch/mips/lemote/lm2e/irq.c @@ -25,7 +25,6 @@ */ #include #include -#include #include #include #include -- cgit v1.2.2 From 796756bab6fd09111159b76288169e18fa13d3e8 Mon Sep 17 00:00:00 2001 From: Songmao Tian Date: Mon, 30 Jul 2007 09:06:45 +0800 Subject: [MIPS] Fulong: Remove unneeded header file Signed-off-by: Songmao Tian Signed-off-by: Ralf Baechle --- arch/mips/lemote/lm2e/prom.c | 4 ---- arch/mips/lemote/lm2e/setup.c | 10 ---------- 2 files changed, 14 deletions(-) (limited to 'arch/mips/lemote') diff --git a/arch/mips/lemote/lm2e/prom.c b/arch/mips/lemote/lm2e/prom.c index 4e3132e47bee..3efb1cf111f2 100644 --- a/arch/mips/lemote/lm2e/prom.c +++ b/arch/mips/lemote/lm2e/prom.c @@ -15,11 +15,7 @@ * option) any later version. */ #include -#include -#include #include - -#include #include extern unsigned long bus_clock; diff --git a/arch/mips/lemote/lm2e/setup.c b/arch/mips/lemote/lm2e/setup.c index dbb801678fd9..f34350a4f271 100644 --- a/arch/mips/lemote/lm2e/setup.c +++ b/arch/mips/lemote/lm2e/setup.c @@ -28,17 +28,7 @@ */ #include #include -#include -#include -#include #include -#include -#include -#include -#include -#include -#include -#include #include #include -- cgit v1.2.2