hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge commit '73053d973' 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: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King 2013-05-02 21:20:46 +01:00
parent bca7a5a049 73053d973d
commit 5e45a0a197
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/arm/mach-highbank/hotplug.c
View File

@ -14,6 +14,7 @@
* this program. If not, see <http://www.gnu.org/licenses/>. * this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <linux/kernel.h> #include <linux/kernel.h>
#include <asm/cacheflush.h>
#include "core.h" #include "core.h"
#include "sysregs.h" #include "sysregs.h"
@ -27,10 +28,10 @@ extern void secondary_startup(void);
void __ref highbank_cpu_die(unsigned int cpu) void __ref highbank_cpu_die(unsigned int cpu)
{ {
highbank_set_cpu_jump(cpu, phys_to_virt(0)); highbank_set_cpu_jump(cpu, phys_to_virt(0));
flush_cache_louis();
highbank_set_core_pwr(); highbank_set_core_pwr();
cpu_do_idle(); while (1)
cpu_do_idle();
/* We should never return from idle */
panic("highbank: cpu %d unexpectedly exit from shutdown\n", cpu);
} }