--- a/usr/src/uts/i86pc/os/startup.c	Thu Mar 09 15:18:14 2006 -0800
+++ b/usr/src/uts/i86pc/os/startup.c	Thu Mar 09 15:37:59 2006 -0800
@@ -1841,6 +1841,11 @@
 		    "cpu%d does not support syscall/sysret", CPU->cpu_id);
 	}
 #endif
+
+#if defined(OPTERON_WORKAROUND_6323525)
+	if (opteron_workaround_6323525)
+		patch_workaround_6323525();
+#endif
 	/*
 	 * Configure the system.
 	 */