aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-11-05 17:30:00 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-01-05 07:57:22 -0500
commitf88b8979d26615ce68772cebc85c3b556571afca (patch)
tree9af99a981ffc5b94faefcf05a4dba15a8554ca82 /arch/arm/kernel
parent5e3aa527c390377cdeea444f14ef5a28a0aab618 (diff)
ARM: restart: remove the now empty arch_reset()
Remove the now empty arch_reset() from all the mach/system.h includes, and remove its callsite. Remove arm_machine_restart() as this function no longer does anything useful. For samsung platforms, remove the include of mach/system-reset.h and plat/system-reset.h from their respective mach/system.h headers as these just define their arch_reset functions. As a result, the s3c2410 and plat-samsung system-reset.h files are no longer referenced, so remove these files entirely. Acked-by: Nicolas Pitre <nico@linaro.org> Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com> Acked-by: Jamie Iles <jamie@jamieiles.com> Acked-by: Tony Lindgren <tony@atomide.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel')
-rw-r--r--arch/arm/kernel/process.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
index eeb3e16c6046..17859ce4e7be 100644
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
@@ -117,14 +117,8 @@ void soft_restart(unsigned long addr)
117 cpu_reset(addr); 117 cpu_reset(addr);
118} 118}
119 119
120void arm_machine_restart(char mode, const char *cmd) 120static void null_restart(char mode, const char *cmd)
121{ 121{
122 /* Disable interrupts first */
123 local_irq_disable();
124 local_fiq_disable();
125
126 /* Call the architecture specific reboot code. */
127 arch_reset(mode, cmd);
128} 122}
129 123
130/* 124/*
@@ -133,7 +127,7 @@ void arm_machine_restart(char mode, const char *cmd)
133void (*pm_power_off)(void); 127void (*pm_power_off)(void);
134EXPORT_SYMBOL(pm_power_off); 128EXPORT_SYMBOL(pm_power_off);
135 129
136void (*arm_pm_restart)(char str, const char *cmd) = arm_machine_restart; 130void (*arm_pm_restart)(char str, const char *cmd) = null_restart;
137EXPORT_SYMBOL_GPL(arm_pm_restart); 131EXPORT_SYMBOL_GPL(arm_pm_restart);
138 132
139static void do_nothing(void *unused) 133static void do_nothing(void *unused)