diff options
author | Jesper Nilsson <jesper.nilsson@axis.com> | 2007-11-14 20:01:00 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-14 21:45:45 -0500 |
commit | 0188e6032119cbeda8c63dbd40f733ae976eb365 (patch) | |
tree | 062a5d735712e6396ed0bcb444eec41a586522cb /arch | |
parent | 7b275523aba522aa76891861ee32ba2456e5f146 (diff) |
cris build fixes: fixes in arch/cris/kernel/time.c
- 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>
Acked-by: Mikael Starvik <starvik@axis.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/cris/kernel/time.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/arch/cris/kernel/time.c b/arch/cris/kernel/time.c index acfd04559405..7a2cc7efbcf8 100644 --- a/arch/cris/kernel/time.c +++ b/arch/cris/kernel/time.c | |||
@@ -171,10 +171,6 @@ get_cmos_time(void) | |||
171 | mon = CMOS_READ(RTC_MONTH); | 171 | mon = CMOS_READ(RTC_MONTH); |
172 | year = CMOS_READ(RTC_YEAR); | 172 | year = CMOS_READ(RTC_YEAR); |
173 | 173 | ||
174 | printk(KERN_DEBUG | ||
175 | "rtc: sec 0x%x min 0x%x hour 0x%x day 0x%x mon 0x%x year 0x%x\n", | ||
176 | sec, min, hour, day, mon, year); | ||
177 | |||
178 | BCD_TO_BIN(sec); | 174 | BCD_TO_BIN(sec); |
179 | BCD_TO_BIN(min); | 175 | BCD_TO_BIN(min); |
180 | BCD_TO_BIN(hour); | 176 | BCD_TO_BIN(hour); |
@@ -207,12 +203,12 @@ void | |||
207 | cris_do_profile(struct pt_regs* regs) | 203 | cris_do_profile(struct pt_regs* regs) |
208 | { | 204 | { |
209 | 205 | ||
210 | #if CONFIG_SYSTEM_PROFILER | 206 | #ifdef CONFIG_SYSTEM_PROFILER |
211 | cris_profile_sample(regs); | 207 | cris_profile_sample(regs); |
212 | #endif | 208 | #endif |
213 | 209 | ||
214 | #if CONFIG_PROFILING | 210 | #ifdef CONFIG_PROFILING |
215 | profile_tick(CPU_PROFILING, regs); | 211 | profile_tick(CPU_PROFILING); |
216 | #endif | 212 | #endif |
217 | } | 213 | } |
218 | 214 | ||