On 01/07/2013 07:24 AM, Jon Medhurst (Tixy) wrote:
On Fri, 2013-01-04 at 14:06 -0800, John Stultz wrote:
Instead of doing the full re-base, I just merged the 3.8-rc2+ tree into the linaro-android-3.7-anton-rebase branch, and the collisions were seemingly manageable.
I've only compile tested on x86_64, since I don't have my cross-tools setup yet.
If someone has the time to test merge that branch and make sure it boots, I'd really appreciate it.
I get this compilation error:
arch/arm/mm/cache-l2x0.c: In function 'l2x0_init': arch/arm/mm/cache-l2x0.c:376:3: error: 'cache_id' undeclared (first use in this function) arch/arm/mm/cache-l2x0.c:376:3: note: each undeclared identifier is reported only once for each function it appears in arch/arm/mm/cache-l2x0.c: At top level: arch/arm/mm/cache-l2x0.c:38:21: warning: 'l2x0_sets' defined but not used [-Wunused-variable]
If I revert Android's cache-l2x0.c change then it builds and boots fine on vexpress. I'm not sure how to test the Android patches specifically but I can confirm the interactive governor was running after boot and the system generally seemed to work as expected.
Great! Thanks for the testing! I'll revert the change you pointed out and will push it out for merging.
-john