Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e45a0a1 authored by Russell King's avatar Russell King
Browse files

Merge commit '73053d97' into smp-hotplug 



This is to fix a merge problem with mach-highbank/hotplug.c, which git
silently resolves, but wrongly.  This commit contains the correct
resolution.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parents bca7a5a0 73053d97

arch/arm/mach-highbank/hotplug.c

+5 −4
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
 * this program.  If not, see <http://www.gnu.org/licenses/>.

 */

#include <linux/kernel.h>

#include <asm/cacheflush.h>



#include "core.h"

#include "sysregs.h"
@@ -27,10 +28,10 @@ extern void secondary_startup(void); 
void __ref highbank_cpu_die(unsigned int cpu)

{

	highbank_set_cpu_jump(cpu, phys_to_virt(0));



	flush_cache_louis();

	highbank_set_core_pwr();



	while (1)

		cpu_do_idle();



	/* We should never return from idle */

	panic("highbank: cpu %d unexpectedly exit from shutdown\n", cpu);

}