Commit eea2d5da authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm 

Pull ARM fixes from Russell King:

 - fix CPU topology setup for SCHED_MC case

 - fix VDSO regression

* tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: 8947/1: Fix __arch_get_hw_counter() access to CNTVCT
  ARM: 8943/1: Fix topology setup in case of CPU hotplug for CONFIG_SCHED_MC
parents 347f56fb 04bb9642

arch/arm/include/asm/vdso/gettimeofday.h

+3 −0
Original line number Diff line number Diff line
@@ -75,6 +75,9 @@ static __always_inline u64 __arch_get_hw_counter(int clock_mode) 
#ifdef CONFIG_ARM_ARCH_TIMER

	u64 cycle_now;



	if (!clock_mode)

		return -EINVAL;



	isb();

	cycle_now = read_sysreg(CNTVCT);

arch/arm/kernel/smp.c

+4 −0
Original line number Diff line number Diff line
@@ -240,6 +240,10 @@ int __cpu_disable(void) 
	if (ret)

		return ret;



#ifdef CONFIG_GENERIC_ARCH_TOPOLOGY

	remove_cpu_topology(cpu);

#endif



	/*

	 * Take this CPU offline.  Once we clear this, we can't return,

	 * and we must not schedule until we're ready to give up the cpu.

arch/arm/kernel/topology.c

+5 −5
Original line number Diff line number Diff line
@@ -196,9 +196,8 @@ void store_cpu_topology(unsigned int cpuid) 
	struct cpu_topology *cpuid_topo = &cpu_topology[cpuid];

	unsigned int mpidr;



	/* If the cpu topology has been already set, just return */

	if (cpuid_topo->core_id != -1)

		return;

	if (cpuid_topo->package_id != -1)

		goto topology_populated;



	mpidr = read_cpuid_mpidr();
@@ -231,14 +230,15 @@ void store_cpu_topology(unsigned int cpuid) 
		cpuid_topo->package_id = -1;

	}



	update_siblings_masks(cpuid);



	update_cpu_capacity(cpuid);



	pr_info("CPU%u: thread %d, cpu %d, socket %d, mpidr %x\n",

		cpuid, cpu_topology[cpuid].thread_id,

		cpu_topology[cpuid].core_id,

		cpu_topology[cpuid].package_id, mpidr);



topology_populated:

	update_siblings_masks(cpuid);

}



static inline int cpu_corepower_flags(void)