--- a/arch/i386/kernel/powernow-k8.c~	2005-02-12 17:47:18 +0300
+++ a/arch/i386/kernel/powernow-k8.c	2005-02-13 14:47:32 +0300
@@ -203,29 +203,6 @@
 	return 0;
 }
 
-/* Change the fid and vid, by the 3 phases. */
-static inline int transition_fid_vid(u32 reqfid, u32 reqvid)
-{
-	if (core_voltage_pre_transition(reqvid))
-		return 1;
-	if (core_frequency_transition(reqfid))
-		return 1;
-	if (core_voltage_post_transition(reqvid))
-		return 1;
-	if (query_current_values_with_pending_wait())
-		return 1;
-
-	if ((reqfid != currfid) || (reqvid != currvid)) {
-		printk(KERN_ERR PFX "failed: req %x %x, curr %x %x\n",
-		       reqfid, reqvid, currfid, currvid);
-		return 1;
-	}
-
-	dprintk(KERN_INFO PFX
-		"transitioned: new fid %x, vid %x\n", currfid, currvid);
-	return 0;
-}
-
 /* Phase 1 - core voltage transition ... setup voltage */
 static inline int core_voltage_pre_transition(u32 reqvid)
 {
@@ -390,6 +367,28 @@
 		currfid, currvid);
 	return 0;
 }
+/* Change the fid and vid, by the 3 phases. */
+static inline int transition_fid_vid(u32 reqfid, u32 reqvid)
+{
+	if (core_voltage_pre_transition(reqvid))
+		return 1;
+	if (core_frequency_transition(reqfid))
+		return 1;
+	if (core_voltage_post_transition(reqvid))
+		return 1;
+	if (query_current_values_with_pending_wait())
+		return 1;
+
+	if ((reqfid != currfid) || (reqvid != currvid)) {
+		printk(KERN_ERR PFX "failed: req %x %x, curr %x %x\n",
+		       reqfid, reqvid, currfid, currvid);
+		return 1;
+	}
+
+	dprintk(KERN_INFO PFX
+		"transitioned: new fid %x, vid %x\n", currfid, currvid);
+	return 0;
+}
 
 static inline int check_supported_cpu(void)
 {