[PATCH 13/16] CRIS architecture: Correct compile errors

[PATCH 13/16] CRIS architecture: Correct compile errors

[Jesper Nilsson]

- Remove debug print.
- Change #if to #ifdef to avoid compile time warning if CONFIG_PROFILING
  isn't set.
- Number of parameters to profile_tick has changed, drop the regs parameter.

Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>

---
 time.c |   10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff -urBb -X /h/jespern/.exclude_files clean_linux-2.6.23/arch/cris/kernel/time.c linux-2.6.23/arch/cris/kernel/time.c
--- clean_linux-2.6.23/arch/cris/kernel/time.c	2007-10-09 22:31:38.000000000 +0200
+++ linux-2.6.23/arch/cris/kernel/time.c	2007-10-22 13:37:20.000000000 +0200
@@ -171,10 +170,6 @@
 	mon = CMOS_READ(RTC_MONTH);
 	year = CMOS_READ(RTC_YEAR);
 
-	printk(KERN_DEBUG
-	       "rtc: sec 0x%x min 0x%x hour 0x%x day 0x%x mon 0x%x year 0x%x\n",
-	       sec, min, hour, day, mon, year);
-
 	BCD_TO_BIN(sec);
 	BCD_TO_BIN(min);
 	BCD_TO_BIN(hour);
@@ -207,12 +202,12 @@
 cris_do_profile(struct pt_regs* regs)
 {
 
-#if CONFIG_SYSTEM_PROFILER
+#ifdef CONFIG_SYSTEM_PROFILER
         cris_profile_sample(regs);
 #endif
 
-#if CONFIG_PROFILING
-        profile_tick(CPU_PROFILING, regs);
+#ifdef CONFIG_PROFILING
+        profile_tick(CPU_PROFILING);
 #endif
 }
 

/^JN - Jesper Nilsson
--
               Jesper Nilsson -- jesper.nilsson@axis.com

RE: [PATCH 13/16] CRIS architecture: Correct compile errors

[Mikael Starvik]

Signed-off-by: Mikael Starvik <starvik@axis.com>

-----Original Message-----
From: Jesper Nilsson [mailto:jespern@axis.com] 
Sent: Tuesday, October 30, 2007 10:35 AM
To: Andrew Morton; Mikael Starvik; Jesper Nilsson;
linux-kernel@vger.kernel.org
Subject: [PATCH 13/16] CRIS architecture: Correct compile errors


- Remove debug print.
- Change #if to #ifdef to avoid compile time warning if CONFIG_PROFILING
  isn't set.
- Number of parameters to profile_tick has changed, drop the regs parameter.

Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>

---
 time.c |   10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff -urBb -X /h/jespern/.exclude_files
clean_linux-2.6.23/arch/cris/kernel/time.c
linux-2.6.23/arch/cris/kernel/time.c
--- clean_linux-2.6.23/arch/cris/kernel/time.c	2007-10-09
22:31:38.000000000 +0200
+++ linux-2.6.23/arch/cris/kernel/time.c	2007-10-22
13:37:20.000000000 +0200
@@ -171,10 +170,6 @@
 	mon = CMOS_READ(RTC_MONTH);
 	year = CMOS_READ(RTC_YEAR);
 
-	printk(KERN_DEBUG
-	       "rtc: sec 0x%x min 0x%x hour 0x%x day 0x%x mon 0x%x year
0x%x\n",
-	       sec, min, hour, day, mon, year);
-
 	BCD_TO_BIN(sec);
 	BCD_TO_BIN(min);
 	BCD_TO_BIN(hour);
@@ -207,12 +202,12 @@
 cris_do_profile(struct pt_regs* regs)
 {
 
-#if CONFIG_SYSTEM_PROFILER
+#ifdef CONFIG_SYSTEM_PROFILER
         cris_profile_sample(regs);
 #endif
 
-#if CONFIG_PROFILING
-        profile_tick(CPU_PROFILING, regs);
+#ifdef CONFIG_PROFILING
+        profile_tick(CPU_PROFILING);
 #endif
 }
 

/^JN - Jesper Nilsson
--
               Jesper Nilsson -- jesper.nilsson@axis.com