summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/mrst.h
diff options
context:
space:
mode:
authorJacob Pan <jacob.jun.pan@linux.intel.com>2010-05-19 12:01:25 -0700
committerH. Peter Anvin <hpa@linux.intel.com>2010-05-19 13:45:39 -0700
commita875c01944f0d750eeb1ef3133feceb13f13c4b3 (patch)
treecdd39431457cdeed92d67420a89296cbfb23f620 /arch/x86/include/asm/mrst.h
parenta0c173bd8a3fd0541be8e4ef962170e48d8811c7 (diff)
x86, mrst: add more timer config options
Always-on local APIC timer (ARAT) has been introduced to Medfield, along with the platform APB timers we have more timer configuration options between Moorestown and Medfield. This patch adds run-time detection of avaiable timer features so that we can treat Medfield as a variant of Moorestown and set up the optimal timer options for each platform. i.e. Medfield: per cpu always-on local APIC timer Moorestown: per cpu APB timer Manual override is possible via cmdline option x86_mrst_timer. Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com> LKML-Reference: <1274295685-6774-4-git-send-email-jacob.jun.pan@linux.intel.com> Acked-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/include/asm/mrst.h')
-rw-r--r--arch/x86/include/asm/mrst.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/mrst.h b/arch/x86/include/asm/mrst.h
index dc5c8500bfc..67ad3154577 100644
--- a/arch/x86/include/asm/mrst.h
+++ b/arch/x86/include/asm/mrst.h
@@ -12,6 +12,7 @@
#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);
/*