summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/mrst.h
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2010-05-19 14:37:40 -0700
committerH. Peter Anvin <hpa@linux.intel.com>2010-05-19 14:37:40 -0700
commit14671386dcbafb3086bbda3cb6f9f27d34c7bf6d (patch)
tree4aa5c86ad7bf03cc4cff52c642d0956cd945de7f /arch/x86/include/asm/mrst.h
parenta75af580bb1fd261bf63cc00e4b324e17ceb15cf (diff)
x86, mrst: make mrst_timer_options an enum
We have an enum mrst_timer_options, use it so that the kernel knows if we're missing something from a switch statement or equivalent. Signed-off-by: H. Peter Anvin <hpa@linux.intel.com> LKML-Reference: <1274295685-6774-4-git-send-email-jacob.jun.pan@linux.intel.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Jacob Pan <jacob.jun.pan@linux.intel.com>
Diffstat (limited to 'arch/x86/include/asm/mrst.h')
-rw-r--r--arch/x86/include/asm/mrst.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/include/asm/mrst.h b/arch/x86/include/asm/mrst.h
index 1869c18d15c..16350740edf 100644
--- a/arch/x86/include/asm/mrst.h
+++ b/arch/x86/include/asm/mrst.h
@@ -11,7 +11,6 @@
#ifndef _ASM_X86_MRST_H
#define _ASM_X86_MRST_H
extern int pci_mrst_init(void);
-extern int mrst_timer_options __cpuinitdata;
int __init sfi_parse_mrtc(struct sfi_table_header *table);
/*
@@ -38,6 +37,8 @@ enum mrst_timer_options {
MRST_TIMER_LAPIC_APBT,
};
+extern enum mrst_timer_options mrst_timer_options;
+
#define SFI_MTMR_MAX_NUM 8
#define SFI_MRTC_MAX 8