[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <4B199287.7020307@gmail.com>
Date: Fri, 04 Dec 2009 23:51:51 +0100
From: Emese Revfy <re.emese@...il.com>
To: tglx@...utronix.de, mingo@...hat.com, hpa@...or.com,
torvalds@...ux-foundation.org, linux-kernel@...r.kernel.org
Subject: [PATCH 31/31] Constify struct wd_ops for 2.6.32 v1
From: Emese Revfy <re.emese@...il.com>
Constify struct wd_ops with some exceptions.
Signed-off-by: Emese Revfy <re.emese@...il.com>
---
arch/x86/kernel/cpu/perfctr-watchdog.c | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/arch/x86/kernel/cpu/perfctr-watchdog.c b/arch/x86/kernel/cpu/perfctr-watchdog.c
index fab786f..2324cbc 100644
--- a/arch/x86/kernel/cpu/perfctr-watchdog.c
+++ b/arch/x86/kernel/cpu/perfctr-watchdog.c
@@ -30,11 +30,11 @@ struct nmi_watchdog_ctlblk {
/* Interface defining a CPU specific perfctr watchdog */
struct wd_ops {
- int (*reserve)(void);
- void (*unreserve)(void);
- int (*setup)(unsigned nmi_hz);
- void (*rearm)(struct nmi_watchdog_ctlblk *wd, unsigned nmi_hz);
- void (*stop)(void);
+ int (* const reserve)(void);
+ void (* const unreserve)(void);
+ int (* const setup)(unsigned nmi_hz);
+ void (* const rearm)(struct nmi_watchdog_ctlblk *wd, unsigned nmi_hz);
+ void (* const stop)(void);
unsigned perfctr;
unsigned evntsel;
u64 checkbit;
@@ -645,6 +645,7 @@ static const struct wd_ops p4_wd_ops = {
#define ARCH_PERFMON_NMI_EVENT_SEL ARCH_PERFMON_UNHALTED_CORE_CYCLES_SEL
#define ARCH_PERFMON_NMI_EVENT_UMASK ARCH_PERFMON_UNHALTED_CORE_CYCLES_UMASK
+/* cannot be const */
static struct wd_ops intel_arch_wd_ops;
static int setup_intel_arch_watchdog(unsigned nmi_hz)
@@ -697,6 +698,7 @@ static int setup_intel_arch_watchdog(unsigned nmi_hz)
return 1;
}
+/* cannot be const */
static struct wd_ops intel_arch_wd_ops __read_mostly = {
.reserve = single_msr_reserve,
.unreserve = single_msr_unreserve,
--
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