[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1335925644-5192-2-git-send-email-mattst88@gmail.com>
Date: Tue, 1 May 2012 22:27:22 -0400
From: Matt Turner <mattst88@...il.com>
To: linux-alpha@...r.kernel.org
Cc: Richard Henderson <rth@...ddle.net>,
Ivan Kokshaysky <ink@...assic.park.msu.ru>,
linux-kernel@...r.kernel.org, Matt Turner <mattst88@...il.com>
Subject: [PATCH 2/4] alpha: properly define get/set_rtc_time on Marvel/SMP
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@...too.org>
Signed-off-by: Matt Turner <mattst88@...il.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-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists