Merge branch 'master' into android
authorJon Medhurst <tixy@linaro.org>
Mon, 12 Dec 2011 07:54:58 +0000 (07:54 +0000)
committerJon Medhurst <tixy@linaro.org>
Mon, 12 Dec 2011 07:54:58 +0000 (07:54 +0000)
driver/gator_main.c

index 1af044bd387f07bf4dfd47bda41f30eb751c0a73..924bcba456f40a6b3ced9e1a2fbba5d47f9c662d 100644 (file)
@@ -71,7 +71,11 @@ static unsigned long gator_protocol_version = 7;
 #define MESSAGE_SCHEDULER_TRACE                9
 #define MESSAGE_PID_NAME                       11
 
+#if 0 /* Disabled because of changes in Linaro 3.1 kernel */
 #define LINUX_PMU_SUPPORT LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35) && defined(CONFIG_CPU_HAS_PMU)
+#else
+#define LINUX_PMU_SUPPORT 0
+#endif
 
 #if defined(__arm__)
 #define PC_REG regs->ARM_pc