--- zzzz-none-000/linux-2.6.19.2/arch/mips/oprofile/op_model_mipsxx.c	2007-01-10 19:10:37.000000000 +0000
+++ davinci-8020-5505/linux-2.6.19.2/arch/mips/oprofile/op_model_mipsxx.c	2007-01-11 07:38:19.000000000 +0000
@@ -31,18 +31,16 @@
 #define M_COUNTER_OVERFLOW		(1UL      << 31)
 
 #ifdef CONFIG_MIPS_MT_SMP
-#define WHAT		(M_TC_EN_VPE | M_PERFCTL_VPEID(smp_processor_id()))
-#define vpe_id()	smp_processor_id()
+#define WHAT	(M_TC_EN_VPE | M_PERFCTL_VPEID(smp_processor_id()))
 #else
-#define WHAT		0
-#define vpe_id()	smp_processor_id()
+#define WHAT	0
 #endif
 
 #define __define_perf_accessors(r, n, np)				\
 									\
 static inline unsigned int r_c0_ ## r ## n(void)			\
 {									\
-	unsigned int cpu = vpe_id();					\
+	unsigned int cpu = smp_processor_id();				\
 									\
 	switch (cpu) {							\
 	case 0:								\
@@ -57,7 +55,7 @@
 									\
 static inline void w_c0_ ## r ## n(unsigned int value)			\
 {									\
-	unsigned int cpu = vpe_id();					\
+	unsigned int cpu = smp_processor_id();				\
 									\
 	switch (cpu) {							\
 	case 0:								\
@@ -220,7 +218,7 @@
 {
 	int counters = __n_counters();
 
-#ifdef CONFIG_MIPS_MT_SMP
+#ifndef CONFIG_SMP
 	if (current_cpu_data.cputype == CPU_34K)
 		return counters >> 1;
 #endif