--- a/usr/src/uts/i86pc/os/startup.c	Fri May 15 15:36:01 2009 -0700
+++ b/usr/src/uts/i86pc/os/startup.c	Fri May 15 14:57:54 2009 -0700
@@ -2016,6 +2016,7 @@
 {
 	int i;
 	extern void setx86isalist(void);
+	extern void cpu_event_init(void);
 
 	PRM_POINT("startup_end() starting...");
 
@@ -2031,6 +2032,11 @@
 	 */
 	kcpc_hw_init(CPU);
 
+	/*
+	 * Initialize cpu event framework.
+	 */
+	cpu_event_init();
+
 #if defined(OPTERON_WORKAROUND_6323525)
 	if (opteron_workaround_6323525)
 		patch_workaround_6323525();
@@ -2125,6 +2131,7 @@
 post_startup(void)
 {
 	extern void cpupm_init(cpu_t *);
+	extern void cpu_event_init_cpu(cpu_t *);
 
 	/*
 	 * Set the system wide, processor-specific flags to be passed
@@ -2184,6 +2191,7 @@
 
 	maxmem = freemem;
 
+	cpu_event_init_cpu(CPU);
 	cpupm_init(CPU);
 
 	add_cpunode2devtree(CPU->cpu_id, CPU->cpu_m.mcpu_cpi);