diff options
author | Simon Horman <horms@verge.net.au> | 2007-02-01 17:09:16 +0900 |
---|---|---|
committer | Simon Horman <horms@verge.net.au> | 2007-02-01 17:16:53 +0900 |
commit | 843c2d1ec1bbd2a1c46c99aa24eb1ae0b2109bd6 (patch) | |
tree | 24e51e9e5d30611d601f46f636b3ff5b344e211b | |
parent | 35917b5e76e8aef49920cc9693c94863f4ae507b (diff) |
kexec-tools: Remove trailing whitespace in sh code
Signed-off-by: Simon Horman <horms@verge.net.au>
-rw-r--r-- | kexec/arch/sh/Makefile | 6 | ||||
-rw-r--r-- | kexec/arch/sh/kexec-netbsd-sh.c | 6 | ||||
-rw-r--r-- | kexec/arch/sh/kexec-sh.c | 14 | ||||
-rw-r--r-- | kexec/arch/sh/kexec-zImage-sh.c | 3 | ||||
-rw-r--r-- | kexec/arch/sh/netbsd_booter.S | 10 |
5 files changed, 19 insertions, 20 deletions
diff --git a/kexec/arch/sh/Makefile b/kexec/arch/sh/Makefile index 8cf52e3..753e073 100644 --- a/kexec/arch/sh/Makefile +++ b/kexec/arch/sh/Makefile @@ -1,8 +1,8 @@ # # kexec sh (linux booting linux) # -KEXEC_C_SRCS+= kexec/arch/sh/kexec-sh.c -KEXEC_C_SRCS+= kexec/arch/sh/kexec-zImage-sh.c -KEXEC_C_SRCS+= kexec/arch/sh/kexec-netbsd-sh.c +KEXEC_C_SRCS+= kexec/arch/sh/kexec-sh.c +KEXEC_C_SRCS+= kexec/arch/sh/kexec-zImage-sh.c +KEXEC_C_SRCS+= kexec/arch/sh/kexec-netbsd-sh.c KEXEC_C_SRCS+= kexec/arch/sh/kexec-elf-rel-sh.c KEXEC_S_SRCS+= kexec/arch/sh/netbsd_booter.S diff --git a/kexec/arch/sh/kexec-netbsd-sh.c b/kexec/arch/sh/kexec-netbsd-sh.c index 935338e..a751420 100644 --- a/kexec/arch/sh/kexec-netbsd-sh.c +++ b/kexec/arch/sh/kexec-netbsd-sh.c @@ -53,7 +53,7 @@ int netbsd_sh_probe(const char *buf, off_t len) void netbsd_sh_usage(void) { - printf( + printf( " --howto=VALUE NetBSD kernel boot option.\n" " --miniroot=FILE NetBSD miniroot ramdisk.\n\n"); } @@ -141,12 +141,12 @@ int netbsd_sh_load(int argc, char **argv, const char *buf, off_t len, /* howto & bootinfo */ param = xmalloc(4096); memset(param, 0, 4096); - paraml = (unsigned long *) ¶m[256]; + paraml = (unsigned long *) ¶m[256]; memcpy(param, netbsd_booter, 256); paraml[0] = entry; paraml[1] = howto_value; add_segment(info, param, 4096, start, 4096); - + /* For now we don't have arguments to pass :( */ info->entry = (void *) (start | 0xa0000000); return 0; diff --git a/kexec/arch/sh/kexec-sh.c b/kexec/arch/sh/kexec-sh.c index 6b485d1..5f5e0f0 100644 --- a/kexec/arch/sh/kexec-sh.c +++ b/kexec/arch/sh/kexec-sh.c @@ -57,7 +57,7 @@ void arch_usage(void) " --empty-zero=0x%08x\n\n" " STRING of --appned is set form /proc/cmdline as default.\n" " ADDRESS of --empty-zero can be set SHELL environment variable\n" - " KEXEC_EMPTY_ZERO as default.\n\n" + " KEXEC_EMPTY_ZERO as default.\n\n" " ADDRESS can be get in the following method in your system. \n" " 1) \"grep empty_zero /proc/kallsyms\". \n" " 2) \"grep empty_zero System.map\". \n" @@ -90,9 +90,9 @@ int arch_process_options(int argc, char **argv) case '?': usage(); return -1; - case OPT_APPEND: - case OPT_NBSD_HOWTO: - case OPT_NBSD_MROOT: + case OPT_APPEND: + case OPT_NBSD_HOWTO: + case OPT_NBSD_MROOT: ; } } @@ -113,10 +113,10 @@ int arch_compat_trampoline(struct kexec_info *info, unsigned long *flags) return -1; } if ( (strcmp(utsname.machine, "sh3") == 0) || - (strcmp(utsname.machine, "sh4") == 0)) + (strcmp(utsname.machine, "sh4") == 0)) { - /* For compatibility with older patches + /* For compatibility with older patches * use KEXEC_ARCH_DEFAULT instead of KEXEC_ARCH_IA64 here. */ *flags |= KEXEC_ARCH_DEFAULT; @@ -142,7 +142,7 @@ unsigned long get_empty_zero(char *s) if(s){ env = s; - }else if(!env){ + }else if(!env){ env = "0x0c001000"; } return 0x1fffffff & strtoul(env,(char **)NULL,0); diff --git a/kexec/arch/sh/kexec-zImage-sh.c b/kexec/arch/sh/kexec-zImage-sh.c index 9527fb6..93ae08b 100644 --- a/kexec/arch/sh/kexec-zImage-sh.c +++ b/kexec/arch/sh/kexec-zImage-sh.c @@ -46,7 +46,6 @@ int zImage_sh_probe(const char *buf, off_t len) void zImage_sh_usage(void) { printf( - " --append=STRING Set the kernel command line to STRING.\n" " --empty-zero=ADDRESS Set the kernel top ADDRESS. \n\n"); @@ -84,7 +83,7 @@ int zImage_sh_load(int argc, char **argv, const char *buf, off_t len, command_line = optarg; break; case OPT_EMPTYZERO: - empty_zero = get_empty_zero(optarg); + empty_zero = get_empty_zero(optarg); break; } } diff --git a/kexec/arch/sh/netbsd_booter.S b/kexec/arch/sh/netbsd_booter.S index e660b3d..d4d16df 100644 --- a/kexec/arch/sh/netbsd_booter.S +++ b/kexec/arch/sh/netbsd_booter.S @@ -1,5 +1,5 @@ .globl netbsd_booter -netbsd_booter: +netbsd_booter: mov.l ccr,r0 mov #0,r1 mov.l r1,@r0 @@ -17,17 +17,17 @@ netbsd_booter: mov.l @r0,r1 add #4,r0 mov.l @r0,r4 ! howto - add #4,r0 + add #4,r0 mov r0,r5 ! bootinfo jmp @r1 nop nop nop .align 4 -ccr: .long 0xff00001c - +ccr: .long 0xff00001c + .align 8 -netbsd_start: +netbsd_start: .long 0x8c001000 .long 0x200 ! howto .long 0 ! bootinfo |