From: Russ Dill <russ.d...@ti.com>
This adds the ability to run soft_restart with local_irq/fiq_disable
already called. This is helpful for the hibernation code paths.
Signed-off-by: Russ Dill <russ.d...@ti.com>
Signed-off-by: Sebastian Capella <sebastian.cape...@linaro.org>
Cc: Russell King <li...@arm.linux.org.uk>
Cc: Andrew Morton <a...@linux-foundation.org>
Cc: Thomas Gleixner <t...@linutronix.de>
Cc: Will Deacon <will.dea...@arm.com>
Cc: Robin Holt <h...@sgi.com>
---
arch/arm/include/asm/system_misc.h | 1 +
arch/arm/kernel/process.c | 15 ++++++++++-----
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/arch/arm/include/asm/system_misc.h
b/arch/arm/include/asm/system_misc.h
index a3d61ad..eca8dd4 100644
--- a/arch/arm/include/asm/system_misc.h
+++ b/arch/arm/include/asm/system_misc.h
@@ -10,6 +10,7 @@
extern void cpu_init(void);
+void soft_restart_noirq(unsigned long);
void soft_restart(unsigned long);
extern void (*arm_pm_restart)(enum reboot_mode reboot_mode, const char *cmd);
extern void (*arm_pm_idle)(void);
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
index 92f7b15..685bc4a 100644
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
@@ -95,14 +95,10 @@ static void __soft_restart(void *addr)
BUG();
}
-void soft_restart(unsigned long addr)
+void soft_restart_noirq(unsigned long addr)
{
u64 *stack = soft_restart_stack + ARRAY_SIZE(soft_restart_stack);
- /* Disable interrupts first */
- local_irq_disable();
- local_fiq_disable();
-
/* Disable the L2 if we're the last man standing. */
if (num_online_cpus() == 1)
outer_disable();
@@ -114,6 +110,15 @@ void soft_restart(unsigned long addr)
BUG();
}
+void soft_restart(unsigned long addr)
+{
+ /* Disable interrupts first */
+ local_irq_disable();
+ local_fiq_disable();
+
+ soft_restart_noirq(addr);
+}
+
static void null_restart(enum reboot_mode reboot_mode, const char *cmd)
{
}
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
