Skip to content

R
raspberrypi-kernel

openeuler / raspberrypi-kernel

通知 13
Star 1
Fork 0
R
raspberrypi-kernel
提交 f88b8979 编写于 作者: R Russell King
浏览文件
操作

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: NNicolas Pitre <nico@linaro.org>
Acked-by: NH Hartley Sweeten <hsweeten@visionengravers.com>
Acked-by: NJamie Iles <jamie@jamieiles.com>
Acked-by: NTony Lindgren <tony@atomide.com>
Acked-by: NLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
上级 5e3aa527
隐藏空白更改
内联 并排
Showing with 2 addition and 245 deletion
arch/arm/include/asm/system.h
浏览文件 @ f88b8979
......@@ -100,7 +100,6 @@ extern void __show_regs(struct pt_regs *);
extern int __pure cpu_architecture(void);
extern void cpu_init(void);
void arm_machine_restart(char mode, const char *cmd);
void soft_restart(unsigned long);
extern void (*arm_pm_restart)(char str, const char *cmd);
......
arch/arm/kernel/process.c
浏览文件 @ f88b8979
......@@ -117,14 +117,8 @@ void soft_restart(unsigned long addr)
cpu_reset(addr);
}
void arm_machine_restart(char mode, const char *cmd)
static void null_restart(char mode, const char *cmd)
{
/* Disable interrupts first */
local_irq_disable();
local_fiq_disable();
/* Call the architecture specific reboot code. */
arch_reset(mode, cmd);
}
/*
......@@ -133,7 +127,7 @@ void arm_machine_restart(char mode, const char *cmd)
void (*pm_power_off)(void);
EXPORT_SYMBOL(pm_power_off);
void (*arm_pm_restart)(char str, const char *cmd) = arm_machine_restart;
void (*arm_pm_restart)(char str, const char *cmd) = null_restart;
EXPORT_SYMBOL_GPL(arm_pm_restart);
static void do_nothing(void *unused)
......
arch/arm/mach-at91/include/mach/system.h
浏览文件 @ f88b8979
......@@ -47,8 +47,4 @@ static inline void arch_idle(void)
#endif
}
static inline void arch_reset(char mode, const char *cmd)
{
}
#endif
arch/arm/mach-bcmring/include/mach/system.h
浏览文件 @ f88b8979
......@@ -25,8 +25,4 @@ static inline void arch_idle(void)
cpu_do_idle();
}
static inline void arch_reset(char mode, const char *cmd)
{
}
#endif
arch/arm/mach-clps711x/include/mach/system.h
浏览文件 @ f88b8979
......@@ -32,8 +32,4 @@ static inline void arch_idle(void)
mov r0, r0");
}
static inline void arch_reset(char mode, const char *cmd)
{
}
#endif
arch/arm/mach-cns3xxx/include/mach/system.h
浏览文件 @ f88b8979
......@@ -22,8 +22,4 @@ static inline void arch_idle(void)
cpu_do_idle();
}
static inline void arch_reset(char mode, const char *cmd)
{
}
#endif
arch/arm/mach-davinci/include/mach/system.h
浏览文件 @ f88b8979
......@@ -18,8 +18,4 @@ static inline void arch_idle(void)
cpu_do_idle();
}
static inline void arch_reset(char mode, const char *cmd)
{
}
#endif /* __ASM_ARCH_SYSTEM_H */
arch/arm/mach-dove/include/mach/system.h
浏览文件 @ f88b8979
......@@ -14,9 +14,4 @@ static inline void arch_idle(void)
cpu_do_idle();
}
static inline void arch_reset(char mode, const char *cmd)
{
}
#endif
arch/arm/mach-ebsa110/include/mach/system.h
浏览文件 @ f88b8979
......@@ -34,8 +34,4 @@ static inline void arch_idle(void)
asm volatile ("mcr p15, 0, ip, c15, c1, 2" : : : "cc");
}
static inline void arch_reset(char mode, const char *cmd)
{
}
#endif
arch/arm/mach-ep93xx/include/mach/system.h
浏览文件 @ f88b8979
......@@ -5,7 +5,3 @@ static inline void arch_idle(void)
{
cpu_do_idle();
}
static inline void arch_reset(char mode, const char *cmd)
{
}
arch/arm/mach-exynos/include/mach/system.h
浏览文件 @ f88b8979
......@@ -13,8 +13,6 @@
#ifndef __ASM_ARCH_SYSTEM_H
#define __ASM_ARCH_SYSTEM_H __FILE__
#include <plat/system-reset.h>
static void arch_idle(void)
{
/* nothing here yet */
......
arch/arm/mach-footbridge/include/mach/system.h
浏览文件 @ f88b8979
......@@ -11,7 +11,3 @@ static inline void arch_idle(void)
{
cpu_do_idle();
}
static inline void arch_reset(char mode, const char *cmd)
{
}
arch/arm/mach-h720x/include/mach/system.h
浏览文件 @ f88b8979
......@@ -24,8 +24,4 @@ static void arch_idle(void)
nop();
}
static inline void arch_reset(char mode, const char *cmd)
{
}
#endif
arch/arm/mach-highbank/include/mach/system.h
浏览文件 @ f88b8979
......@@ -21,8 +21,4 @@ static inline void arch_idle(void)
cpu_do_idle();
}
static inline void arch_reset(char mode, const char *cmd)
{
}
#endif
arch/arm/mach-integrator/include/mach/system.h
浏览文件 @ f88b8979
......@@ -30,8 +30,4 @@ static inline void arch_idle(void)
cpu_do_idle();
}
static inline void arch_reset(char mode, const char *cmd)
{
}
#endif
arch/arm/mach-iop13xx/include/mach/system.h
浏览文件 @ f88b8979
......@@ -11,7 +11,3 @@ static inline void arch_idle(void)
{
cpu_do_idle();
}
static inline void arch_reset(char mode, const char *cmd)
{
}
arch/arm/mach-iop32x/include/mach/system.h
浏览文件 @ f88b8979
......@@ -11,7 +11,3 @@ static inline void arch_idle(void)
{
cpu_do_idle();
}
static inline void arch_reset(char mode, const char *cmd)
{
}
arch/arm/mach-iop33x/include/mach/system.h
浏览文件 @ f88b8979
......@@ -11,7 +11,3 @@ static inline void arch_idle(void)
{
cpu_do_idle();
}
static inline void arch_reset(char mode, const char *cmd)
{
}
arch/arm/mach-ixp2000/include/mach/system.h
浏览文件 @ f88b8979
......@@ -12,7 +12,3 @@ static inline void arch_idle(void)
{
cpu_do_idle();
}
static inline void arch_reset(char mode, const char *cmd)
{
}
arch/arm/mach-ixp23xx/include/mach/system.h
浏览文件 @ f88b8979
......@@ -14,7 +14,3 @@ static inline void arch_idle(void)
cpu_do_idle();
#endif
}
static inline void arch_reset(char mode, const char *cmd)
{
}
arch/arm/mach-ixp4xx/include/mach/system.h
浏览文件 @ f88b8979
......@@ -17,7 +17,3 @@ static inline void arch_idle(void)
cpu_do_idle();
#endif
}
static inline void arch_reset(char mode, const char *cmd)
{
}
arch/arm/mach-kirkwood/include/mach/system.h
浏览文件 @ f88b8979
......@@ -14,8 +14,4 @@ static inline void arch_idle(void)
cpu_do_idle();
}
static inline void arch_reset(char mode, const char *cmd)
{
}
#endif
arch/arm/mach-ks8695/include/mach/system.h
浏览文件 @ f88b8979
......@@ -24,8 +24,4 @@ static void arch_idle(void)
}
static void arch_reset(char mode, const char *cmd)
{
}
#endif
arch/arm/mach-lpc32xx/include/mach/system.h
浏览文件 @ f88b8979
......@@ -24,8 +24,4 @@ static void arch_idle(void)
cpu_do_idle();
}
static inline void arch_reset(char mode, const char *cmd)
{
}
#endif
arch/arm/mach-mmp/include/mach/system.h
浏览文件 @ f88b8979
......@@ -13,8 +13,4 @@ static inline void arch_idle(void)
{
cpu_do_idle();
}
static inline void arch_reset(char mode, const char *cmd)
{
}
#endif /* __ASM_MACH_SYSTEM_H */
arch/arm/mach-msm/include/mach/system.h
浏览文件 @ f88b8979
......@@ -14,10 +14,6 @@
*/
void arch_idle(void);
static inline void arch_reset(char mode, const char *cmd)
{
}
/* low level hardware reset hook -- for example, hitting the
* PSHOLD line on the PMIC to hard reset the system
*/
......
arch/arm/mach-mv78xx0/include/mach/system.h
浏览文件 @ f88b8979
......@@ -14,9 +14,4 @@ static inline void arch_idle(void)
cpu_do_idle();
}
static inline void arch_reset(char mode, const char *cmd)
{
}
#endif
arch/arm/mach-mxs/include/mach/system.h
浏览文件 @ f88b8979
......@@ -22,8 +22,4 @@ static inline void arch_idle(void)
cpu_do_idle();
}
static inline void arch_reset(char mode, const char *cmd)
{
}
#endif /* __MACH_MXS_SYSTEM_H__ */
arch/arm/mach-netx/include/mach/system.h
浏览文件 @ f88b8979
......@@ -24,9 +24,5 @@ static inline void arch_idle(void)
cpu_do_idle();
}
static inline void arch_reset(char mode, const char *cmd)
{
}
#endif
arch/arm/mach-nomadik/include/mach/system.h
浏览文件 @ f88b8979
......@@ -29,8 +29,4 @@ static inline void arch_idle(void)
cpu_do_idle();
}
static inline void arch_reset(char mode, const char *cmd)
{
}
#endif
arch/arm/mach-orion5x/include/mach/system.h
浏览文件 @ f88b8979
......@@ -16,8 +16,4 @@ static inline void arch_idle(void)
cpu_do_idle();
}
static inline void arch_reset(char mode, const char *cmd)
{
}
#endif
arch/arm/mach-picoxcell/include/mach/system.h
浏览文件 @ f88b8979
......@@ -23,8 +23,4 @@ static inline void arch_idle(void)
cpu_do_idle();
}
static inline void arch_reset(int mode, const char *cmd)
{
}
#endif /* __ASM_ARCH_SYSTEM_H */
arch/arm/mach-pnx4008/include/mach/system.h
浏览文件 @ f88b8979
......@@ -26,8 +26,4 @@ static void arch_idle(void)
cpu_do_idle();
}
static inline void arch_reset(char mode, const char *cmd)
{
}
#endif
arch/arm/mach-prima2/include/mach/system.h
浏览文件 @ f88b8979
......@@ -14,8 +14,4 @@ static inline void arch_idle(void)
cpu_do_idle();
}
static inline void arch_reset(char mode, const char *cmd)
{
}
#endif
arch/arm/mach-pxa/include/mach/system.h
浏览文件 @ f88b8979
......@@ -13,7 +13,3 @@ static inline void arch_idle(void)
{
cpu_do_idle();
}
static inline void arch_reset(char mode, const char *cmd)
{
}
arch/arm/mach-realview/include/mach/system.h
浏览文件 @ f88b8979
......@@ -30,8 +30,4 @@ static inline void arch_idle(void)
cpu_do_idle();
}
static inline void arch_reset(char mode, const char *cmd)
{
}
#endif
arch/arm/mach-rpc/include/mach/system.h
浏览文件 @ f88b8979
......@@ -11,7 +11,3 @@ static inline void arch_idle(void)
{
cpu_do_idle();
}
static inline void arch_reset(char mode, const char *cmd)
{
}
arch/arm/mach-s3c2410/include/mach/system-reset.h 已删除 100644 → 0
浏览文件 @ 5e3aa527
/* arch/arm/mach-s3c2410/include/mach/system-reset.h
*
* Copyright (c) 2008 Simtec Electronics
* Ben Dooks <ben@simtec.co.uk>
*
* S3C2410 - System define for arch_reset() function
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
static void arch_reset(char mode, const char *cmd)
{
}
arch/arm/mach-s3c2410/include/mach/system.h
浏览文件 @ f88b8979
......@@ -52,5 +52,3 @@ static void arch_idle(void)
else
s3c24xx_default_idle();
}
#include <mach/system-reset.h>
arch/arm/mach-s3c64xx/include/mach/system.h
浏览文件 @ f88b8979
......@@ -16,8 +16,4 @@ static void arch_idle(void)
/* nothing here yet */
}
static void arch_reset(char mode, const char *cmd)
{
}
#endif /* __ASM_ARCH_IRQ_H */
arch/arm/mach-s5p64x0/include/mach/system.h
浏览文件 @ f88b8979
......@@ -13,8 +13,6 @@
#ifndef __ASM_ARCH_SYSTEM_H
#define __ASM_ARCH_SYSTEM_H __FILE__
#include <plat/system-reset.h>
static void arch_idle(void)
{
/* nothing here yet */
......
arch/arm/mach-s5pc100/include/mach/system.h
浏览文件 @ f88b8979
......@@ -11,8 +11,6 @@
#ifndef __ASM_ARCH_SYSTEM_H
#define __ASM_ARCH_SYSTEM_H __FILE__
#include <plat/system-reset.h>
static void arch_idle(void)
{
/* nothing here yet */
......
arch/arm/mach-s5pv210/include/mach/system.h
浏览文件 @ f88b8979
......@@ -13,8 +13,6 @@
#ifndef __ASM_ARCH_SYSTEM_H
#define __ASM_ARCH_SYSTEM_H __FILE__
#include <plat/system-reset.h>
static void arch_idle(void)
{
/* nothing here yet */
......
arch/arm/mach-sa1100/include/mach/system.h
浏览文件 @ f88b8979
......@@ -7,7 +7,3 @@ static inline void arch_idle(void)
{
cpu_do_idle();
}
static inline void arch_reset(char mode, const char *cmd)
{
}
arch/arm/mach-shark/include/mach/system.h
浏览文件 @ f88b8979
......@@ -6,10 +6,6 @@
#ifndef __ASM_ARCH_SYSTEM_H
#define __ASM_ARCH_SYSTEM_H
static inline void arch_reset(char mode, const char *cmd)
{
}
static inline void arch_idle(void)
{
}
......
arch/arm/mach-tegra/include/mach/system.h
浏览文件 @ f88b8979
......@@ -21,10 +21,6 @@
#ifndef __MACH_TEGRA_SYSTEM_H
#define __MACH_TEGRA_SYSTEM_H
static inline void arch_reset(char mode, const char *cmd)
{
}
static inline void arch_idle(void)
{
}
......
arch/arm/mach-u300/include/mach/system.h
浏览文件 @ f88b8979
......@@ -12,7 +12,3 @@ static inline void arch_idle(void)
{
cpu_do_idle();
}
static inline void arch_reset(char mode, const char *cmd)
{
}
arch/arm/mach-ux500/include/mach/system.h
浏览文件 @ f88b8979
......@@ -17,8 +17,4 @@ static inline void arch_idle(void)
cpu_do_idle();
}
static inline void arch_reset(char mode, const char *cmd)
{
}
#endif
arch/arm/mach-versatile/include/mach/system.h
浏览文件 @ f88b8979
......@@ -30,8 +30,4 @@ static inline void arch_idle(void)
cpu_do_idle();
}
static inline void arch_reset(char mode, const char *cmd)
{
}
#endif
arch/arm/mach-vexpress/include/mach/system.h
浏览文件 @ f88b8979
......@@ -30,8 +30,4 @@ static inline void arch_idle(void)
cpu_do_idle();
}
static inline void arch_reset(char mode, const char *cmd)
{
}
#endif
arch/arm/mach-w90x900/include/mach/system.h
浏览文件 @ f88b8979
......@@ -17,8 +17,3 @@
static void arch_idle(void)
{
}
static void arch_reset(char mode, const char *cmd)
{
}
arch/arm/mach-zynq/include/mach/system.h
浏览文件 @ f88b8979
......@@ -20,8 +20,4 @@ static inline void arch_idle(void)
cpu_do_idle();
}
static inline void arch_reset(char mode, const char *cmd)
{
}
#endif
arch/arm/plat-mxc/include/mach/system.h
浏览文件 @ f88b8979
......@@ -22,8 +22,4 @@ static inline void arch_idle(void)
cpu_do_idle();
}
static inline void arch_reset(char mode, const char *cmd)
{
}
#endif /* __ASM_ARCH_MXC_SYSTEM_H__ */
arch/arm/plat-omap/include/plat/system.h
浏览文件 @ f88b8979
......@@ -12,8 +12,4 @@ static inline void arch_idle(void)
cpu_do_idle();
}
static inline void arch_reset(char mode, const char *cmd)
{
}
#endif
arch/arm/plat-samsung/include/plat/system-reset.h 已删除 100644 → 0
浏览文件 @ 5e3aa527
/* linux/arch/arm/plat-samsung/include/plat/system-reset.h
*
* Copyright (c) 2010 Samsung Electronics Co., Ltd.
* http://www.samsung.com
*
* Based on arch/arm/mach-s3c2410/include/mach/system-reset.h
*
* S5P - System define for arch_reset()
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
#include <plat/watchdog-reset.h>
static void arch_reset(char mode, const char *cmd)
{
arch_wdt_reset();
}
arch/arm/plat-spear/include/plat/system.h
浏览文件 @ f88b8979
......@@ -23,8 +23,4 @@ static inline void arch_idle(void)
cpu_do_idle();
}
static inline void arch_reset(char mode, const char *cmd)
{
}
#endif /* __PLAT_SYSTEM_H */
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或