UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

i386: constify wd_ops 

.. as they're, with a single exception, never written to.

[ tglx: arch/x86 adaptation ]

Signed-off-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Jan Beulich 2007-10-17 18:04:39 +02:00 committed by Thomas Gleixner
parent 909dd324fb
commit d1e084746b
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/x86/kernel/cpu/perfctr-watchdog.c
View File

@ -34,7 +34,7 @@ struct wd_ops {
u64 checkbit; u64 checkbit;
}; };
static struct wd_ops *wd_ops; static const struct wd_ops *wd_ops;
/* this number is calculated from Intel's MSR_P4_CRU_ESCR5 register and it's /* this number is calculated from Intel's MSR_P4_CRU_ESCR5 register and it's
* offset from MSR_P4_BSU_ESCR0. It will be the max for all platforms (for now) * offset from MSR_P4_BSU_ESCR0. It will be the max for all platforms (for now)
@ -317,7 +317,7 @@ static void single_msr_rearm(struct nmi_watchdog_ctlblk *wd, unsigned nmi_hz)
write_watchdog_counter(wd->perfctr_msr, NULL, nmi_hz); write_watchdog_counter(wd->perfctr_msr, NULL, nmi_hz);
} }
static struct wd_ops k7_wd_ops = { static const struct wd_ops k7_wd_ops = {
.reserve = single_msr_reserve, .reserve = single_msr_reserve,
.unreserve = single_msr_unreserve, .unreserve = single_msr_unreserve,
.setup = setup_k7_watchdog, .setup = setup_k7_watchdog,
@ -380,7 +380,7 @@ static void p6_rearm(struct nmi_watchdog_ctlblk *wd, unsigned nmi_hz)
write_watchdog_counter32(wd->perfctr_msr, NULL,nmi_hz); write_watchdog_counter32(wd->perfctr_msr, NULL,nmi_hz);
} }
static struct wd_ops p6_wd_ops = { static const struct wd_ops p6_wd_ops = {
.reserve = single_msr_reserve, .reserve = single_msr_reserve,
.unreserve = single_msr_unreserve, .unreserve = single_msr_unreserve,
.setup = setup_p6_watchdog, .setup = setup_p6_watchdog,
@ -532,7 +532,7 @@ static void p4_rearm(struct nmi_watchdog_ctlblk *wd, unsigned nmi_hz)
write_watchdog_counter(wd->perfctr_msr, NULL, nmi_hz); write_watchdog_counter(wd->perfctr_msr, NULL, nmi_hz);
} }
static struct wd_ops p4_wd_ops = { static const struct wd_ops p4_wd_ops = {
.reserve = p4_reserve, .reserve = p4_reserve,
.unreserve = p4_unreserve, .unreserve = p4_unreserve,
.setup = setup_p4_watchdog, .setup = setup_p4_watchdog,
@ -550,6 +550,8 @@ static struct wd_ops p4_wd_ops = {
#define ARCH_PERFMON_NMI_EVENT_SEL ARCH_PERFMON_UNHALTED_CORE_CYCLES_SEL #define ARCH_PERFMON_NMI_EVENT_SEL ARCH_PERFMON_UNHALTED_CORE_CYCLES_SEL
#define ARCH_PERFMON_NMI_EVENT_UMASK ARCH_PERFMON_UNHALTED_CORE_CYCLES_UMASK #define ARCH_PERFMON_NMI_EVENT_UMASK ARCH_PERFMON_UNHALTED_CORE_CYCLES_UMASK
static struct wd_ops intel_arch_wd_ops;
static int setup_intel_arch_watchdog(unsigned nmi_hz) static int setup_intel_arch_watchdog(unsigned nmi_hz)
{ {
unsigned int ebx; unsigned int ebx;
@ -591,11 +593,11 @@ static int setup_intel_arch_watchdog(unsigned nmi_hz)
wd->perfctr_msr = perfctr_msr; wd->perfctr_msr = perfctr_msr;
wd->evntsel_msr = evntsel_msr; wd->evntsel_msr = evntsel_msr;
wd->cccr_msr = 0; //unused wd->cccr_msr = 0; //unused
wd_ops->checkbit = 1ULL << (eax.split.bit_width - 1); intel_arch_wd_ops.checkbit = 1ULL << (eax.split.bit_width - 1);
return 1; return 1;
} }
static struct wd_ops intel_arch_wd_ops = { static struct wd_ops intel_arch_wd_ops __read_mostly = {
.reserve = single_msr_reserve, .reserve = single_msr_reserve,
.unreserve = single_msr_unreserve, .unreserve = single_msr_unreserve,
.setup = setup_intel_arch_watchdog, .setup = setup_intel_arch_watchdog,