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

Commit 0188e603 authored by Jesper Nilsson's avatar Jesper Nilsson Committed by Linus Torvalds
Browse files

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: default avatarJesper Nilsson <jesper.nilsson@axis.com>
Acked-by: default avatarMikael Starvik <starvik@axis.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7b275523

arch/cris/kernel/time.c

+3 −7
Original line number Diff line number Diff line
@@ -171,10 +171,6 @@ get_cmos_time(void) 
	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 +203,12 @@ void 
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

}