diff --git a/arch/arm/mach-msm/include/mach/irqs-8x60.h b/arch/arm/mach-msm/include/mach/irqs-8x60.h
index f65841c74c0..a2494d1925d 100644
--- a/arch/arm/mach-msm/include/mach/irqs-8x60.h
+++ b/arch/arm/mach-msm/include/mach/irqs-8x60.h
@@ -42,7 +42,7 @@
 
 #define SC_SICMPUIRPTREQ			(GIC_SPI_START + 0)
 #define SC_SICL2IRPTREQ				(GIC_SPI_START + 1)
-#define SC_SICL2ACGIRPTREQ			(GIC_SPI_START + 2)
+#define SC_SICL2PERFMONIRPTREQ			(GIC_SPI_START + 2)
 #define NC					(GIC_SPI_START + 3)
 #define TLMM_SCSS_DIR_CONN_IRQ_0		(GIC_SPI_START + 4)
 #define TLMM_SCSS_DIR_CONN_IRQ_1		(GIC_SPI_START + 5)
diff --git a/arch/arm/perfmon/Makefile b/arch/arm/perfmon/Makefile
index 7f57fba6116..716e0873d39 100644
--- a/arch/arm/perfmon/Makefile
+++ b/arch/arm/perfmon/Makefile
@@ -2,8 +2,5 @@ obj-$(CONFIG_KSAPI) += ksapi.o
 
 # Object file lists.
 obj-y						+= perf-function-hooks.o
-#ifdef CONFIG_ARCH_MSM8X60
-ksapi-y						+= perf-v7.o perf-smp.o per.o per-process-perf.o per-axi.o
-#else
 ksapi-y						+= perf-v7.o per.o per-process-perf.o per-axi.o
-#endif
+ksapi-$(CONFIG_ARCH_MSM8X60)			+= perf-smp.o
diff --git a/arch/arm/perfmon/perf-smp.c b/arch/arm/perfmon/perf-smp.c
index 4c4f95a8c61..21c18cddd7f 100644
--- a/arch/arm/perfmon/perf-smp.c
+++ b/arch/arm/perfmon/perf-smp.c
@@ -698,15 +698,7 @@ void l2_pm_initialize(void)
 		return;
   initialized = 1;
 
-	#ifdef CONFIG_ARCH_QSD8X50
-		irqid = INT_ARM11_PM;
-	#endif
-	#ifdef CONFIG_ARCH_MSM7X30
-		irqid = INT_ARM11_PM;
-	#endif
-	#ifdef CONFIG_ARCH_MSM8X60
-		irqid = CPU_SICCPUXPERFMONIRPTREQ;
-	#endif
+  irqid = SC_SICL2PERFMONIRPTREQ;
   RCP15_L2PMCR(reg);
   imp = (reg>>24) & 0xFF;
   id  = (reg>>16) & 0xFF;
diff --git a/arch/arm/perfmon/perf-v7.c b/arch/arm/perfmon/perf-v7.c
index 6d4cd6a793b..912cfd9d402 100644
--- a/arch/arm/perfmon/perf-v7.c
+++ b/arch/arm/perfmon/perf-v7.c
@@ -956,12 +956,7 @@ void pm_initialize(void)
 		return;
   initialized = 1;
 
-	#ifdef CONFIG_ARCH_QSD8X50
-		irqid = INT_ARM11_PM;
-	#endif
-	#ifdef CONFIG_ARCH_MSM7X30
-		irqid = INT_ARM11_PM;
-	#endif
+  irqid = INT_ARMQC_PERFMON;
   RCP15_PMCR(reg);
   imp = (reg>>24) & 0xFF;
   id  = (reg>>16) & 0xFF;