summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-11-05 12:36:40 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-01-05 12:57:22 +0000
commit5e3aa527c390377cdeea444f14ef5a28a0aab618 (patch)
tree35071d55a06d3a6559f69d12e2d58f9c6c80218c
parente6849374f3fcec5a51ab6df40ae4d8034ba1c5e0 (diff)
ARM: restart: remove comments about adding code to arch_reset()
arch_reset() is deprecated; systems should hook into system restart via the 'restart' method in the platforms machine description record. Acked-by: Nicolas Pitre <nico@linaro.org> Acked-by: Jamie Iles <jamie@jamieiles.com> Acked-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/mach-msm/include/mach/system.h4
-rw-r--r--arch/arm/mach-picoxcell/include/mach/system.h1
-rw-r--r--arch/arm/mach-ux500/include/mach/system.h1
-rw-r--r--arch/arm/mach-zynq/include/mach/system.h1
4 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/mach-msm/include/mach/system.h b/arch/arm/mach-msm/include/mach/system.h
index d2e83f42ba1..e180e8b4598 100644
--- a/arch/arm/mach-msm/include/mach/system.h
+++ b/arch/arm/mach-msm/include/mach/system.h
@@ -12,14 +12,10 @@
* GNU General Public License for more details.
*
*/
-
-#include <mach/hardware.h>
-
void arch_idle(void);
static inline void arch_reset(char mode, const char *cmd)
{
- for (;;) ; /* depends on IPC w/ other core */
}
/* low level hardware reset hook -- for example, hitting the
diff --git a/arch/arm/mach-picoxcell/include/mach/system.h b/arch/arm/mach-picoxcell/include/mach/system.h
index 67c589b0c1b..a12da634fdd 100644
--- a/arch/arm/mach-picoxcell/include/mach/system.h
+++ b/arch/arm/mach-picoxcell/include/mach/system.h
@@ -25,7 +25,6 @@ static inline void arch_idle(void)
static inline void arch_reset(int mode, const char *cmd)
{
- /* Watchdog reset to go here. */
}
#endif /* __ASM_ARCH_SYSTEM_H */
diff --git a/arch/arm/mach-ux500/include/mach/system.h b/arch/arm/mach-ux500/include/mach/system.h
index c0cd8006f1a..ae1dff1d7e6 100644
--- a/arch/arm/mach-ux500/include/mach/system.h
+++ b/arch/arm/mach-ux500/include/mach/system.h
@@ -19,7 +19,6 @@ static inline void arch_idle(void)
static inline void arch_reset(char mode, const char *cmd)
{
- /* yet to be implemented - TODO */
}
#endif
diff --git a/arch/arm/mach-zynq/include/mach/system.h b/arch/arm/mach-zynq/include/mach/system.h
index 1b84d705c67..34be7ed4b67 100644
--- a/arch/arm/mach-zynq/include/mach/system.h
+++ b/arch/arm/mach-zynq/include/mach/system.h
@@ -22,7 +22,6 @@ static inline void arch_idle(void)
static inline void arch_reset(char mode, const char *cmd)
{
- /* Add architecture specific reset processing here */
}
#endif