diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2010-05-19 14:37:40 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2010-05-19 14:37:40 -0700 |
| commit | 14671386dcbafb3086bbda3cb6f9f27d34c7bf6d (patch) | |
| tree | 4aa5c86ad7bf03cc4cff52c642d0956cd945de7f | |
| parent | a75af580bb1fd261bf63cc00e4b324e17ceb15cf (diff) | |
| download | op-kernel-dev-14671386dcbafb3086bbda3cb6f9f27d34c7bf6d.zip op-kernel-dev-14671386dcbafb3086bbda3cb6f9f27d34c7bf6d.tar.gz | |
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>
| -rw-r--r-- | arch/x86/include/asm/mrst.h | 3 | ||||
| -rw-r--r-- | arch/x86/kernel/mrst.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/include/asm/mrst.h b/arch/x86/include/asm/mrst.h index 1869c18..1635074 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 diff --git a/arch/x86/kernel/mrst.c b/arch/x86/kernel/mrst.c index 967f268..7ee4ed9 100644 --- a/arch/x86/kernel/mrst.c +++ b/arch/x86/kernel/mrst.c @@ -46,7 +46,7 @@ * lapic (always-on,ARAT) ------ 150 */ -int mrst_timer_options __cpuinitdata; +__cpuinitdata enum mrst_timer_options mrst_timer_options; static u32 sfi_mtimer_usage[SFI_MTMR_MAX_NUM]; static struct sfi_timer_table_entry sfi_mtimer_array[SFI_MTMR_MAX_NUM]; |
