From: Matt Turner <mattst88@gmail.com>
To: linux-alpha@vger.kernel.org
Cc: Richard Henderson <rth@twiddle.net>,
Ivan Kokshaysky <ink@jurassic.park.msu.ru>,
linux-kernel@vger.kernel.org, Matt Turner <mattst88@gmail.com>
Subject: [PATCH 2/4] alpha: properly define get/set_rtc_time on Marvel/SMP
Date: Tue, 1 May 2012 22:27:22 -0400 [thread overview]
Message-ID: <1335925644-5192-2-git-send-email-mattst88@gmail.com> (raw)
In-Reply-To: <1335925644-5192-1-git-send-email-mattst88@gmail.com>
The marvel_get_rtc_time and marvel_set_rtc_time are static, but they're
available through Marvel's machine vector.
Reported-by: Ra√∫l Porcel <armin76@gentoo.org>
Signed-off-by: Matt Turner <mattst88@gmail.com>
---
Ivan: I'd appreciate it if you could confirm that this is okay. It's not
clear to me how the marvel_get/set_rtc_time functions could have ever been
called externally.
arch/alpha/include/asm/rtc.h | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/arch/alpha/include/asm/rtc.h b/arch/alpha/include/asm/rtc.h
index 1f7fba6..d70408d 100644
--- a/arch/alpha/include/asm/rtc.h
+++ b/arch/alpha/include/asm/rtc.h
@@ -1,14 +1,10 @@
#ifndef _ALPHA_RTC_H
#define _ALPHA_RTC_H
-#if defined(CONFIG_ALPHA_GENERIC)
+#if defined(CONFIG_ALPHA_MARVEL) && defined(CONFIG_SMP) \
+ || defined(CONFIG_ALPHA_GENERIC)
# define get_rtc_time alpha_mv.rtc_get_time
# define set_rtc_time alpha_mv.rtc_set_time
-#else
-# if defined(CONFIG_ALPHA_MARVEL) && defined(CONFIG_SMP)
-# define get_rtc_time marvel_get_rtc_time
-# define set_rtc_time marvel_set_rtc_time
-# endif
#endif
#include <asm-generic/rtc.h>
--
1.7.3.4
--
To unsubscribe from this list: send the line "unsubscribe linux-alpha" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2012-05-02 2:27 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-02 2:27 [PATCH 1/4] alpha: VGA_HOSE depends on VGA_CONSOLE Matt Turner
2012-05-02 2:27 ` Matt Turner [this message]
2012-05-02 2:27 ` [PATCH 3/4] alpha: include module.h to fix modpost on Tsunami Matt Turner
2012-05-02 2:27 ` [PATCH 4/4] alpha: silence 'const' warning in sys_marvel.c Matt Turner
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=1335925644-5192-2-git-send-email-mattst88@gmail.com \
--to=mattst88@gmail.com \
--cc=ink@jurassic.park.msu.ru \
--cc=linux-alpha@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rth@twiddle.net \
/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;
as well as URLs for NNTP newsgroup(s).