diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2010-05-19 13:40:14 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2010-05-19 13:47:11 -0700 |
| commit | a75af580bb1fd261bf63cc00e4b324e17ceb15cf (patch) | |
| tree | 4e49d335c4211b580dc4bcbbdad1a5e609ef46e8 /arch/x86/include/asm/mrst.h | |
| parent | a875c01944f0d750eeb1ef3133feceb13f13c4b3 (diff) | |
| download | blackbird-op-linux-a75af580bb1fd261bf63cc00e4b324e17ceb15cf.tar.gz blackbird-op-linux-a75af580bb1fd261bf63cc00e4b324e17ceb15cf.zip | |
x86, mrst: make mrst_identify_cpu() an inline returning enum
We have an enum, might as well use it. While we're at it, make it an
inline... there is really no point in calling a function for this
stuff.
LKML-Reference: <1274295685-6774-3-git-send-email-jacob.jun.pan@linux.intel.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Acked-by: 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.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/x86/include/asm/mrst.h b/arch/x86/include/asm/mrst.h index 67ad31545778..1869c18d15ca 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_identify_cpu(void); extern int mrst_timer_options __cpuinitdata; int __init sfi_parse_mrtc(struct sfi_table_header *table); @@ -27,6 +26,12 @@ enum mrst_cpu_type { MRST_CPU_CHIP_PENWELL, }; +extern enum mrst_cpu_type __mrst_cpu_chip; +static enum mrst_cpu_type mrst_identify_cpu(void) +{ + return __mrst_cpu_chip; +} + enum mrst_timer_options { MRST_TIMER_DEFAULT, MRST_TIMER_APBT_ONLY, |
