From: Jesper Nilsson <jesper.nilsson@axis.com>
To: Andrew Morton <akpm@linux-foundation.org>,
Mikael Starvik <mikael.starvik@axis.com>,
Jesper Nilsson <jesper.nilsson@axis.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH 13/16] CRIS architecture: Correct compile errors
Date: Tue, 30 Oct 2007 10:34:46 +0100 [thread overview]
Message-ID: <20071030093446.GP11960@axis.com> (raw)
- 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
next reply other threads:[~2007-10-30 9:36 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-30 9:34 Jesper Nilsson [this message]
[not found] <BFECAF9E178F144FAEF2BF4CE739C6680549C7F1@exmail1.se.axis.com>
2007-10-30 11:19 ` [PATCH 13/16] CRIS architecture: Correct compile errors Mikael Starvik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20071030093446.GP11960@axis.com \
--to=jesper.nilsson@axis.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mikael.starvik@axis.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.