Merge branch 'devel-stable' into for-next

Conflicts:
	arch/arm/kernel/perf_event_cpu.c

diff --cc arch/arm/include/asm/memory.h
Simple merge

diff --cc arch/arm/include/asm/uaccess.h
Simple merge

diff --cc arch/arm/kernel/perf_event.c
Simple merge

diff --cc arch/arm/kernel/perf_event_cpu.c
index c02c2e8,c63dc42..e6a6edb
--- 1/arch/arm/kernel/perf_event_cpu.c
--- 2/arch/arm/kernel/perf_event_cpu.c
+++ b/arch/arm/kernel/perf_event_cpu.c
@@@ -254,35 -259,38 +257,39 @@@ static int probe_current_pmu(struct arm
  
        pr_info("probing PMU on CPU %d\n", cpu);
  
 +      switch (read_cpuid_part()) {
        /* ARM Ltd CPUs. */
 -      if (implementor == ARM_CPU_IMP_ARM) {
 -              switch (part_number) {
 -              case ARM_CPU_PART_ARM1136:
 -                      ret = armv6_1136_pmu_init(pmu);
 -                      break;
 -              case ARM_CPU_PART_ARM1156:
 -                      ret = armv6_1156_pmu_init(pmu);
 -                      break;
 -              case ARM_CPU_PART_ARM1176:
 -                      ret = armv6_1176_pmu_init(pmu);
 -                      break;
 -              case ARM_CPU_PART_ARM11MPCORE:
 -                      ret = armv6mpcore_pmu_init(pmu);
 -                      break;
 -              case ARM_CPU_PART_CORTEX_A8:
 -                      ret = armv7_a8_pmu_init(pmu);
 -                      break;
 -              case ARM_CPU_PART_CORTEX_A9:
 -                      ret = armv7_a9_pmu_init(pmu);
 -                      break;
 -              }
 -      /* Intel CPUs [xscale]. */
 -      } else if (implementor == ARM_CPU_IMP_INTEL) {
 -              switch (xscale_cpu_arch_version()) {
 -              case ARM_CPU_XSCALE_ARCH_V1:
 -                      ret = xscale1pmu_init(pmu);
 -                      break;
 -              case ARM_CPU_XSCALE_ARCH_V2:
 -                      ret = xscale2pmu_init(pmu);
 -                      break;
 +      case ARM_CPU_PART_ARM1136:
++              ret = armv6_1136_pmu_init(pmu);
++              break;
 +      case ARM_CPU_PART_ARM1156:
++              ret = armv6_1156_pmu_init(pmu);
++              break;
 +      case ARM_CPU_PART_ARM1176:
-               ret = armv6pmu_init(pmu);
++              ret = armv6_1176_pmu_init(pmu);
 +              break;
 +      case ARM_CPU_PART_ARM11MPCORE:
 +              ret = armv6mpcore_pmu_init(pmu);
 +              break;
 +      case ARM_CPU_PART_CORTEX_A8:
 +              ret = armv7_a8_pmu_init(pmu);
 +              break;
 +      case ARM_CPU_PART_CORTEX_A9:
 +              ret = armv7_a9_pmu_init(pmu);
 +              break;
 +
 +      default:
 +              if (read_cpuid_implementor() == ARM_CPU_IMP_INTEL) {
 +                      switch (xscale_cpu_arch_version()) {
 +                      case ARM_CPU_XSCALE_ARCH_V1:
 +                              ret = xscale1pmu_init(pmu);
 +                              break;
 +                      case ARM_CPU_XSCALE_ARCH_V2:
 +                              ret = xscale2pmu_init(pmu);
 +                              break;
 +                      }
                }
 +              break;
        }
  
        put_cpu();

diff --cc arch/arm/oprofile/common.c
Simple merge