Merge branches 'fixes', 'mcpm', 'misc' and 'mmci' into for-next

This commit is contained in:
Russell King
2013-06-29 11:43:28 +01:00
38 changed files with 591 additions and 191 deletions

View File

@@ -456,6 +456,13 @@ void __init smp_setup_processor_id(void)
for (i = 1; i < nr_cpu_ids; ++i)
cpu_logical_map(i) = i == cpu ? 0 : i;
/*
* clear __my_cpu_offset on boot CPU to avoid hang caused by
* using percpu variable early, for example, lockdep will
* access percpu variable inside lock_release
*/
set_my_cpu_offset(0);
printk(KERN_INFO "Booting Linux on physical CPU 0x%x\n", mpidr);
}