From 7a24417c812554ca9ee3ee2014dcf3c610e8774e Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@linux.intel.com>
Date: Wed, 19 May 2010 14:37:40 -0700
Subject: [PATCH] --- yaml --- r: 205472 b: refs/heads/master c:
 14671386dcbafb3086bbda3cb6f9f27d34c7bf6d h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/arch/x86/include/asm/mrst.h | 3 ++-
 trunk/arch/x86/kernel/mrst.c      | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 2de40242e3f5..db7529b6d6b8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a75af580bb1fd261bf63cc00e4b324e17ceb15cf
+refs/heads/master: 14671386dcbafb3086bbda3cb6f9f27d34c7bf6d
diff --git a/trunk/arch/x86/include/asm/mrst.h b/trunk/arch/x86/include/asm/mrst.h
index 1869c18d15ca..16350740edf6 100644
--- a/trunk/arch/x86/include/asm/mrst.h
+++ b/trunk/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/trunk/arch/x86/kernel/mrst.c b/trunk/arch/x86/kernel/mrst.c
index 967f2686adb0..7ee4ed901baf 100644
--- a/trunk/arch/x86/kernel/mrst.c
+++ b/trunk/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];