On 11 July 2012 14:32, Jon Medhurst (Tixy) tixy@linaro.org wrote:
On Wed, 2012-07-11 at 10:57 +0100, Viresh Kumar wrote: There's going to be an 'interesting' merge with our TC2 enablement branch.
In arch/arm/kernel/topology.c both branches factor out update_siblings_masks(), one of them modifies it.
And in the same file, both branches also add functions called parse_dt_topology() with different functionality. In the resolution I'm currently testing, I fixed this by renaming the version from big-LITTLE-MP-v2 to parse_dt_for_cpu_capacity() as that seemed an accurate description of what it did. Is it tool late to also do this in the MP branch?
There are two patches doing the same thing (Vincent probably picked this patch from Lorenzo and updated it a bit),
So, you can probably drop below patch from linux-arm tree and try a merge.
c5833d5 ARM: kernel: build CPU topology from DT
I have tested this branch of mine, (big-LITTLE-MP-V2) with TC2 patches from linux-arm and MP task placement patches are working fine. (Obviously I dropped above mentioned patch)
-- viresh