[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-Id: <caf988a9c8087f157203fa3b7a6c172954ee1436.1260663005.git.re.emese@gmail.com>
Date: Mon, 14 Dec 2009 01:00:38 +0100
From: re.emese@...il.com
To: linux-kernel@...r.kernel.org
Cc: Emese Revfy <re.emese@...il.com>, mingo@...hat.com, hpa@...or.com,
tglx@...utronix.de, akpm@...ux-foundation.org,
torvalds@...ux-foundation.org
Subject: [PATCH 1/1] Constify struct wd_ops for 2.6.32-git-053fe57ac v2
From: Emese Revfy <re.emese@...il.com>
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 898df97..89dad0b 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, see probe_nmi_watchdog */
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, see probe_nmi_watchdog */
static struct wd_ops intel_arch_wd_ops __read_mostly = {
.reserve = single_msr_reserve,
.unreserve = single_msr_unreserve,
--
1.6.5.3
--
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