From: Johannes Weiner <jw@emlix.com>
To: Chris Zankel <chris@zankel.net>
Cc: linux-kernel@vger.kernel.org, Oskar Schirmer <os@emlix.com>
Subject: [patch 3/5] xtensa: fix wrong extern declaration renamed in code using it
Date: Mon, 11 May 2009 15:43:35 +0200 [thread overview]
Message-ID: <1242049417-12564-4-git-send-email-jw@emlix.com> (raw)
In-Reply-To: <1242049417-12564-1-git-send-email-jw@emlix.com>
From: Oskar Schirmer <os@emlix.com>
The variable ccount_nsec has been renamed to nsec_per_ccount
in arch/xtensa/kernel/time.c in 2b8aea74 (2007-08-05),
but the fix failed to rename the variable in
arch/xtensa/include/asm/timex.h as well.
Signed-off-by: Oskar Schirmer <os@emlix.com>
---
arch/xtensa/include/asm/timex.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/xtensa/include/asm/timex.h b/arch/xtensa/include/asm/timex.h
index b83a818..053bc42 100644
--- a/arch/xtensa/include/asm/timex.h
+++ b/arch/xtensa/include/asm/timex.h
@@ -39,9 +39,9 @@
#ifdef CONFIG_XTENSA_CALIBRATE_CCOUNT
extern unsigned long ccount_per_jiffy;
-extern unsigned long ccount_nsec;
+extern unsigned long nsec_per_ccount;
#define CCOUNT_PER_JIFFY ccount_per_jiffy
-#define NSEC_PER_CCOUNT ccount_nsec
+#define NSEC_PER_CCOUNT nsec_per_ccount
#else
#define CCOUNT_PER_JIFFY (CONFIG_XTENSA_CPU_CLOCK*(1000000UL/HZ))
#define NSEC_PER_CCOUNT (1000UL / CONFIG_XTENSA_CPU_CLOCK)
--
1.6.3.rc3
next prev parent reply other threads:[~2009-05-11 13:42 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-11 13:43 xtensa patches for -rc5 Johannes Weiner
2009-05-11 13:43 ` [patch 1/5] xtensa: always use correct stack pointer for stack traces Johannes Weiner
2009-05-11 13:43 ` [patch 2/5] xtensa: register gpio chip before use Johannes Weiner
2009-05-11 13:43 ` Johannes Weiner [this message]
2009-05-11 13:43 ` [patch 4/5] xtensa: implement ccount calibration for s6000 Johannes Weiner
2009-05-11 13:43 ` [patch 5/5] xtensa: update s6105_defconfig for ccount calibration Johannes Weiner
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=1242049417-12564-4-git-send-email-jw@emlix.com \
--to=jw@emlix.com \
--cc=chris@zankel.net \
--cc=linux-kernel@vger.kernel.org \
--cc=os@emlix.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®