From: marc.zyngier@arm.com (Marc Zyngier)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 15/15] ARM: local timers: make the runtime registration interface mandatory
Date: Wed, 11 Jan 2012 13:08:54 +0000 [thread overview]
Message-ID: <1326287334-1905-16-git-send-email-marc.zyngier@arm.com> (raw)
In-Reply-To: <1326287334-1905-1-git-send-email-marc.zyngier@arm.com>
Remove all traces of the compile-time local timer interface,
and make the runtime selection mandatory.
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
---
arch/arm/include/asm/localtimer.h | 26 --------------------------
arch/arm/kernel/smp.c | 10 ++++++----
2 files changed, 6 insertions(+), 30 deletions(-)
diff --git a/arch/arm/include/asm/localtimer.h b/arch/arm/include/asm/localtimer.h
index 955eed1..f77ffc1 100644
--- a/arch/arm/include/asm/localtimer.h
+++ b/arch/arm/include/asm/localtimer.h
@@ -19,38 +19,12 @@ struct local_timer_ops {
void (*stop)(struct clock_event_device *);
};
-/*
- * Setup a per-cpu timer, whether it be a local timer or dummy broadcast
- */
-void percpu_timer_setup(void);
-
#ifdef CONFIG_LOCAL_TIMERS
/*
- * Stop the local timer
- */
-void local_timer_stop(struct clock_event_device *);
-
-/*
- * Setup a local timer interrupt for a CPU.
- */
-int local_timer_setup(struct clock_event_device *);
-
-/*
* Register a local timer driver
*/
int local_timer_register(struct local_timer_ops *);
-
#else
-
-static inline int local_timer_setup(struct clock_event_device *evt)
-{
- return -ENXIO;
-}
-
-static inline void local_timer_stop(struct clock_event_device *evt)
-{
-}
-
static inline int local_timer_register(struct local_timer_ops *ops)
{
return -ENXIO;
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
index d36c978..18e7878 100644
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -260,6 +260,8 @@ static void __cpuinit smp_store_cpu_info(unsigned int cpuid)
store_cpu_topology(cpuid);
}
+static void percpu_timer_setup(void);
+
/*
* This is the secondary CPU boot entry. We're using this CPUs
* idle thread stack, but a set of temporary page tables.
@@ -486,7 +488,7 @@ int local_timer_register(struct local_timer_ops *ops)
return 0;
}
-int __attribute__ ((weak)) local_timer_setup(struct clock_event_device *clk)
+static int local_timer_setup(struct clock_event_device *clk)
{
if (lt_ops)
return lt_ops->setup(clk);
@@ -494,13 +496,13 @@ int __attribute__ ((weak)) local_timer_setup(struct clock_event_device *clk)
return -ENXIO;
}
-void __attribute__ ((weak)) local_timer_stop(struct clock_event_device *clk)
+static void local_timer_stop(struct clock_event_device *clk)
{
if (lt_ops)
lt_ops->stop(clk);
}
-
-void __cpuinit percpu_timer_setup(void)
+
+static void __cpuinit percpu_timer_setup(void)
{
unsigned int cpu = smp_processor_id();
struct clock_event_device *evt = &per_cpu(percpu_clockevent, cpu);
--
1.7.7.1
prev parent reply other threads:[~2012-01-11 13:08 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-11 13:08 [PATCH 00/15] Runtime registration for local timers Marc Zyngier
2012-01-11 13:08 ` [PATCH 01/15] ARM: smp_twd: make local_timer_stop a symbol instead of a #define Marc Zyngier
2012-01-11 13:08 ` [PATCH 02/15] ARM: local timers: introduce a new registration interface Marc Zyngier
2012-01-11 13:08 ` [PATCH 03/15] ARM: smp_twd: add runtime registration support Marc Zyngier
2012-01-11 13:08 ` [PATCH 04/15] ARM: smp_twd: add device tree support Marc Zyngier
2012-01-11 21:05 ` Rob Herring
2012-01-12 14:36 ` Marc Zyngier
2012-01-12 15:42 ` Rob Herring
2012-01-12 16:00 ` Marc Zyngier
2012-01-12 16:27 ` Rob Herring
2012-01-12 17:58 ` Marc Zyngier
2012-01-11 13:08 ` [PATCH 05/15] ARM: OMAP4: convert to twd_local_timer_register() interface Marc Zyngier
2012-01-11 13:14 ` Shilimkar, Santosh
2012-01-11 13:08 ` [PATCH 06/15] ARM: plat-versatile: " Marc Zyngier
2012-01-12 9:14 ` Russell King - ARM Linux
2012-01-12 11:53 ` Marc Zyngier
2012-01-11 13:08 ` [PATCH 07/15] ARM: tegra: " Marc Zyngier
2012-01-11 21:49 ` Stephen Warren
2012-01-11 13:08 ` [PATCH 08/15] ARM: shmobile: " Marc Zyngier
2012-01-12 9:19 ` Russell King - ARM Linux
2012-01-12 11:24 ` Marc Zyngier
2012-01-12 12:00 ` Marc Zyngier
2012-01-11 13:08 ` [PATCH 09/15] ARM: ux500: " Marc Zyngier
2012-01-11 23:53 ` Linus Walleij
2012-01-12 13:59 ` Marc Zyngier
2012-01-14 11:43 ` Linus Walleij
2012-01-12 9:16 ` Russell King - ARM Linux
2012-01-12 10:55 ` Marc Zyngier
2012-01-11 13:08 ` [PATCH 10/15] ARM: highbank: " Marc Zyngier
2012-01-11 13:08 ` [PATCH 11/15] ARM: imx6q: " Marc Zyngier
2012-01-12 9:21 ` Shawn Guo
2012-01-11 13:08 ` [PATCH 12/15] ARM: smp_twd: remove old local timer interface Marc Zyngier
2012-01-11 13:08 ` [PATCH 13/15] ARM: local timers: convert exynos to runtime registration interface Marc Zyngier
2012-01-11 13:08 ` [PATCH 14/15] ARM: local timers: convert MSM " Marc Zyngier
2012-01-13 0:13 ` David Brown
2012-01-13 0:27 ` David Brown
2012-01-13 10:11 ` Marc Zyngier
2012-01-11 13:08 ` Marc Zyngier [this message]
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=1326287334-1905-16-git-send-email-marc.zyngier@arm.com \
--to=marc.zyngier@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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).