diff options
author | Maneesh Soni <maneesh@in.ibm.com> | 2005-06-25 17:58:28 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-25 19:24:55 -0400 |
commit | 72414d3f1d22fc3e311b162fca95c430048d38ce (patch) | |
tree | 46850947c1602357dd3c51d8d6ebaa5805507f9f /arch/ppc | |
parent | 4f339ecb30c759f94a29992d4635d9194132b6cf (diff) |
[PATCH] kexec code cleanup
o Following patch provides purely cosmetic changes and corrects CodingStyle
guide lines related certain issues like below in kexec related files
o braces for one line "if" statements, "for" loops,
o more than 80 column wide lines,
o No space after "while", "for" and "switch" key words
o Changes:
o take-2: Removed the extra tab before "case" key words.
o take-3: Put operator at the end of line and space before "*/"
Signed-off-by: Maneesh Soni <maneesh@in.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/ppc')
-rw-r--r-- | arch/ppc/kernel/machine_kexec.c | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/arch/ppc/kernel/machine_kexec.c b/arch/ppc/kernel/machine_kexec.c index b82535357d6d..84d65a87191e 100644 --- a/arch/ppc/kernel/machine_kexec.c +++ b/arch/ppc/kernel/machine_kexec.c | |||
@@ -21,24 +21,23 @@ | |||
21 | #include <asm/machdep.h> | 21 | #include <asm/machdep.h> |
22 | 22 | ||
23 | typedef NORET_TYPE void (*relocate_new_kernel_t)( | 23 | typedef NORET_TYPE void (*relocate_new_kernel_t)( |
24 | unsigned long indirection_page, unsigned long reboot_code_buffer, | 24 | unsigned long indirection_page, |
25 | unsigned long start_address) ATTRIB_NORET; | 25 | unsigned long reboot_code_buffer, |
26 | unsigned long start_address) ATTRIB_NORET; | ||
26 | 27 | ||
27 | const extern unsigned char relocate_new_kernel[]; | 28 | const extern unsigned char relocate_new_kernel[]; |
28 | const extern unsigned int relocate_new_kernel_size; | 29 | const extern unsigned int relocate_new_kernel_size; |
29 | 30 | ||
30 | void machine_shutdown(void) | 31 | void machine_shutdown(void) |
31 | { | 32 | { |
32 | if (ppc_md.machine_shutdown) { | 33 | if (ppc_md.machine_shutdown) |
33 | ppc_md.machine_shutdown(); | 34 | ppc_md.machine_shutdown(); |
34 | } | ||
35 | } | 35 | } |
36 | 36 | ||
37 | void machine_crash_shutdown(struct pt_regs *regs) | 37 | void machine_crash_shutdown(struct pt_regs *regs) |
38 | { | 38 | { |
39 | if (ppc_md.machine_crash_shutdown) { | 39 | if (ppc_md.machine_crash_shutdown) |
40 | ppc_md.machine_crash_shutdown(); | 40 | ppc_md.machine_crash_shutdown(); |
41 | } | ||
42 | } | 41 | } |
43 | 42 | ||
44 | /* | 43 | /* |
@@ -48,9 +47,8 @@ void machine_crash_shutdown(struct pt_regs *regs) | |||
48 | */ | 47 | */ |
49 | int machine_kexec_prepare(struct kimage *image) | 48 | int machine_kexec_prepare(struct kimage *image) |
50 | { | 49 | { |
51 | if (ppc_md.machine_kexec_prepare) { | 50 | if (ppc_md.machine_kexec_prepare) |
52 | return ppc_md.machine_kexec_prepare(image); | 51 | return ppc_md.machine_kexec_prepare(image); |
53 | } | ||
54 | /* | 52 | /* |
55 | * Fail if platform doesn't provide its own machine_kexec_prepare | 53 | * Fail if platform doesn't provide its own machine_kexec_prepare |
56 | * implementation. | 54 | * implementation. |
@@ -60,9 +58,8 @@ int machine_kexec_prepare(struct kimage *image) | |||
60 | 58 | ||
61 | void machine_kexec_cleanup(struct kimage *image) | 59 | void machine_kexec_cleanup(struct kimage *image) |
62 | { | 60 | { |
63 | if (ppc_md.machine_kexec_cleanup) { | 61 | if (ppc_md.machine_kexec_cleanup) |
64 | ppc_md.machine_kexec_cleanup(image); | 62 | ppc_md.machine_kexec_cleanup(image); |
65 | } | ||
66 | } | 63 | } |
67 | 64 | ||
68 | /* | 65 | /* |
@@ -71,9 +68,9 @@ void machine_kexec_cleanup(struct kimage *image) | |||
71 | */ | 68 | */ |
72 | NORET_TYPE void machine_kexec(struct kimage *image) | 69 | NORET_TYPE void machine_kexec(struct kimage *image) |
73 | { | 70 | { |
74 | if (ppc_md.machine_kexec) { | 71 | if (ppc_md.machine_kexec) |
75 | ppc_md.machine_kexec(image); | 72 | ppc_md.machine_kexec(image); |
76 | } else { | 73 | else { |
77 | /* | 74 | /* |
78 | * Fall back to normal restart if platform doesn't provide | 75 | * Fall back to normal restart if platform doesn't provide |
79 | * its own kexec function, and user insist to kexec... | 76 | * its own kexec function, and user insist to kexec... |
@@ -83,7 +80,6 @@ NORET_TYPE void machine_kexec(struct kimage *image) | |||
83 | for(;;); | 80 | for(;;); |
84 | } | 81 | } |
85 | 82 | ||
86 | |||
87 | /* | 83 | /* |
88 | * This is a generic machine_kexec function suitable at least for | 84 | * This is a generic machine_kexec function suitable at least for |
89 | * non-OpenFirmware embedded platforms. | 85 | * non-OpenFirmware embedded platforms. |
@@ -104,15 +100,15 @@ void machine_kexec_simple(struct kimage *image) | |||
104 | 100 | ||
105 | /* we need both effective and real address here */ | 101 | /* we need both effective and real address here */ |
106 | reboot_code_buffer = | 102 | reboot_code_buffer = |
107 | (unsigned long)page_address(image->control_code_page); | 103 | (unsigned long)page_address(image->control_code_page); |
108 | reboot_code_buffer_phys = virt_to_phys((void *)reboot_code_buffer); | 104 | reboot_code_buffer_phys = virt_to_phys((void *)reboot_code_buffer); |
109 | 105 | ||
110 | /* copy our kernel relocation code to the control code page */ | 106 | /* copy our kernel relocation code to the control code page */ |
111 | memcpy((void *)reboot_code_buffer, | 107 | memcpy((void *)reboot_code_buffer, relocate_new_kernel, |
112 | relocate_new_kernel, relocate_new_kernel_size); | 108 | relocate_new_kernel_size); |
113 | 109 | ||
114 | flush_icache_range(reboot_code_buffer, | 110 | flush_icache_range(reboot_code_buffer, |
115 | reboot_code_buffer + KEXEC_CONTROL_CODE_SIZE); | 111 | reboot_code_buffer + KEXEC_CONTROL_CODE_SIZE); |
116 | printk(KERN_INFO "Bye!\n"); | 112 | printk(KERN_INFO "Bye!\n"); |
117 | 113 | ||
118 | /* now call it */ | 114 | /* now call it */ |