---

yaml --- r: 39644 b: refs/heads/master c: caede34 h: refs/heads/master v: v3
git-mirror · Nov 8, 2006 · 3ff38bd · 3ff38bd
1 parent 11ec70e
commit 3ff38bd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d7a1944e8da5e91859b98259189aaaa4d8b7fa07
+refs/heads/master: caede347c3578b9dca49f53eab781fcaaacd3234
diff --git a/trunk/arch/i386/kernel/cpu/cpufreq/speedstep-lib.c b/trunk/arch/i386/kernel/cpu/cpufreq/speedstep-lib.c
@@ -123,6 +123,7 @@ static unsigned int pentiumM_get_frequency(void)
 	return (msr_tmp * 100 * 1000);
 }
 
+#ifdef CONFIG_X86_32
 static unsigned int pentium_core_get_frequency(void)
 {
 	u32 fsb = 0;
@@ -152,7 +153,7 @@ static unsigned int pentium_core_get_frequency(void)
 
 	return (msr_tmp * fsb * 1000);
 }
-
+#endif
 
 static unsigned int pentium4_get_frequency(void)
 {
@@ -204,8 +205,10 @@ static unsigned int pentium4_get_frequency(void)
 unsigned int speedstep_get_processor_frequency(unsigned int processor)
 {
 	switch (processor) {
+#ifdef CONFIG_X86_32
 	case SPEEDSTEP_PROCESSOR_PCORE:
 		return pentium_core_get_frequency();
+#endif
 	case SPEEDSTEP_PROCESSOR_PM:
 		return pentiumM_get_frequency();
 	case SPEEDSTEP_PROCESSOR_P4D: