aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/i386/Kconfig2
-rw-r--r--arch/i386/Kconfig.cpu2
-rw-r--r--arch/i386/kernel/cpu/cyrix.c2
-rw-r--r--arch/i386/kernel/crash.c2
-rw-r--r--arch/i386/kernel/i8259.c2
-rw-r--r--arch/i386/kernel/machine_kexec.c4
-rw-r--r--arch/mips/momentum/ocelot_g/gt-irq.c4
-rw-r--r--arch/mips/sgi-ip22/ip22-reset.c2
-rw-r--r--arch/mips/sgi-ip32/ip32-reset.c12
-rw-r--r--arch/powerpc/kernel/crash.c2
-rw-r--r--arch/powerpc/kernel/machine_kexec_32.c4
-rw-r--r--arch/powerpc/platforms/cell/spufs/switch.c2
-rw-r--r--arch/powerpc/platforms/pseries/eeh_cache.c2
-rw-r--r--arch/ppc/kernel/machine_kexec.c4
-rw-r--r--arch/s390/kernel/machine_kexec.c4
-rw-r--r--arch/s390/kernel/vtime.c2
-rw-r--r--arch/sh/kernel/machine_kexec.c4
-rw-r--r--arch/um/drivers/ubd_kern.c2
-rw-r--r--arch/x86_64/kernel/crash.c2
-rw-r--r--arch/x86_64/kernel/i8259.c2
-rw-r--r--arch/x86_64/kernel/machine_kexec.c4
-rw-r--r--arch/x86_64/kernel/smp.c2
22 files changed, 34 insertions, 34 deletions
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index f3eaf22f273d..47c08bcd9b24 100644
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -734,7 +734,7 @@ config KEXEC
734 help 734 help
735 kexec is a system call that implements the ability to shutdown your 735 kexec is a system call that implements the ability to shutdown your
736 current kernel, and to start another kernel. It is like a reboot 736 current kernel, and to start another kernel. It is like a reboot
737 but it is indepedent of the system firmware. And like a reboot 737 but it is independent of the system firmware. And like a reboot
738 you can start any kernel with it, not just Linux. 738 you can start any kernel with it, not just Linux.
739 739
740 The name comes from the similiarity to the exec system call. 740 The name comes from the similiarity to the exec system call.
diff --git a/arch/i386/Kconfig.cpu b/arch/i386/Kconfig.cpu
index eb130482ba18..21c9a4e71104 100644
--- a/arch/i386/Kconfig.cpu
+++ b/arch/i386/Kconfig.cpu
@@ -41,7 +41,7 @@ config M386
41 - "GeodeGX1" for Geode GX1 (Cyrix MediaGX). 41 - "GeodeGX1" for Geode GX1 (Cyrix MediaGX).
42 - "Geode GX/LX" For AMD Geode GX and LX processors. 42 - "Geode GX/LX" For AMD Geode GX and LX processors.
43 - "CyrixIII/VIA C3" for VIA Cyrix III or VIA C3. 43 - "CyrixIII/VIA C3" for VIA Cyrix III or VIA C3.
44 - "VIA C3-2 for VIA C3-2 "Nehemiah" (model 9 and above). 44 - "VIA C3-2" for VIA C3-2 "Nehemiah" (model 9 and above).
45 45
46 If you don't know what to do, choose "386". 46 If you don't know what to do, choose "386".
47 47
diff --git a/arch/i386/kernel/cpu/cyrix.c b/arch/i386/kernel/cpu/cyrix.c
index fc32c8028e24..f03b7f94c304 100644
--- a/arch/i386/kernel/cpu/cyrix.c
+++ b/arch/i386/kernel/cpu/cyrix.c
@@ -354,7 +354,7 @@ static void __init init_nsc(struct cpuinfo_x86 *c)
354 * This function only handles the GX processor, and kicks every 354 * This function only handles the GX processor, and kicks every
355 * thing else to the Cyrix init function above - that should 355 * thing else to the Cyrix init function above - that should
356 * cover any processors that might have been branded differently 356 * cover any processors that might have been branded differently
357 * after NSC aquired Cyrix. 357 * after NSC acquired Cyrix.
358 * 358 *
359 * If this breaks your GX1 horribly, please e-mail 359 * If this breaks your GX1 horribly, please e-mail
360 * info-linux@ldcmail.amd.com to tell us. 360 * info-linux@ldcmail.amd.com to tell us.
diff --git a/arch/i386/kernel/crash.c b/arch/i386/kernel/crash.c
index 0c88d3ec8c18..48f0f62f781c 100644
--- a/arch/i386/kernel/crash.c
+++ b/arch/i386/kernel/crash.c
@@ -158,7 +158,7 @@ static void nmi_shootdown_cpus(void)
158void machine_crash_shutdown(struct pt_regs *regs) 158void machine_crash_shutdown(struct pt_regs *regs)
159{ 159{
160 /* This function is only called after the system 160 /* This function is only called after the system
161 * has paniced or is otherwise in a critical state. 161 * has panicked or is otherwise in a critical state.
162 * The minimum amount of code to allow a kexec'd kernel 162 * The minimum amount of code to allow a kexec'd kernel
163 * to run successfully needs to happen here. 163 * to run successfully needs to happen here.
164 * 164 *
diff --git a/arch/i386/kernel/i8259.c b/arch/i386/kernel/i8259.c
index b7636b96e104..c1a42feba286 100644
--- a/arch/i386/kernel/i8259.c
+++ b/arch/i386/kernel/i8259.c
@@ -175,7 +175,7 @@ static void mask_and_ack_8259A(unsigned int irq)
175 * Lightweight spurious IRQ detection. We do not want 175 * Lightweight spurious IRQ detection. We do not want
176 * to overdo spurious IRQ handling - it's usually a sign 176 * to overdo spurious IRQ handling - it's usually a sign
177 * of hardware problems, so we only do the checks we can 177 * of hardware problems, so we only do the checks we can
178 * do without slowing down good hardware unnecesserily. 178 * do without slowing down good hardware unnecessarily.
179 * 179 *
180 * Note that IRQ7 and IRQ15 (the two spurious IRQs 180 * Note that IRQ7 and IRQ15 (the two spurious IRQs
181 * usually resulting from the 8259A-1|2 PICs) occur 181 * usually resulting from the 8259A-1|2 PICs) occur
diff --git a/arch/i386/kernel/machine_kexec.c b/arch/i386/kernel/machine_kexec.c
index f73d7374a2ba..511abe52a94e 100644
--- a/arch/i386/kernel/machine_kexec.c
+++ b/arch/i386/kernel/machine_kexec.c
@@ -133,9 +133,9 @@ typedef asmlinkage NORET_TYPE void (*relocate_new_kernel_t)(
133 unsigned long start_address, 133 unsigned long start_address,
134 unsigned int has_pae) ATTRIB_NORET; 134 unsigned int has_pae) ATTRIB_NORET;
135 135
136const extern unsigned char relocate_new_kernel[]; 136extern const unsigned char relocate_new_kernel[];
137extern void relocate_new_kernel_end(void); 137extern void relocate_new_kernel_end(void);
138const extern unsigned int relocate_new_kernel_size; 138extern const unsigned int relocate_new_kernel_size;
139 139
140/* 140/*
141 * A architecture hook called to validate the 141 * A architecture hook called to validate the
diff --git a/arch/mips/momentum/ocelot_g/gt-irq.c b/arch/mips/momentum/ocelot_g/gt-irq.c
index e5eceed1beff..8bd9b844fa9e 100644
--- a/arch/mips/momentum/ocelot_g/gt-irq.c
+++ b/arch/mips/momentum/ocelot_g/gt-irq.c
@@ -59,7 +59,7 @@ void hook_irq_handler(int int_cause, int bit_num, void *isr_ptr)
59 * bit_num - Indicates which bit number in the cause register 59 * bit_num - Indicates which bit number in the cause register
60 * 60 *
61 * Outputs : 61 * Outputs :
62 * 1 if succesful, 0 if failure 62 * 1 if successful, 0 if failure
63 */ 63 */
64int enable_galileo_irq(int int_cause, int bit_num) 64int enable_galileo_irq(int int_cause, int bit_num)
65{ 65{
@@ -83,7 +83,7 @@ int enable_galileo_irq(int int_cause, int bit_num)
83 * bit_num - Indicates which bit number in the cause register 83 * bit_num - Indicates which bit number in the cause register
84 * 84 *
85 * Outputs : 85 * Outputs :
86 * 1 if succesful, 0 if failure 86 * 1 if successful, 0 if failure
87 */ 87 */
88int disable_galileo_irq(int int_cause, int bit_num) 88int disable_galileo_irq(int int_cause, int bit_num)
89{ 89{
diff --git a/arch/mips/sgi-ip22/ip22-reset.c b/arch/mips/sgi-ip22/ip22-reset.c
index a9c58e067b53..8134220ed600 100644
--- a/arch/mips/sgi-ip22/ip22-reset.c
+++ b/arch/mips/sgi-ip22/ip22-reset.c
@@ -34,7 +34,7 @@
34#define POWERDOWN_TIMEOUT 120 34#define POWERDOWN_TIMEOUT 120
35 35
36/* 36/*
37 * Blink frequency during reboot grace period and when paniced. 37 * Blink frequency during reboot grace period and when panicked.
38 */ 38 */
39#define POWERDOWN_FREQ (HZ / 4) 39#define POWERDOWN_FREQ (HZ / 4)
40#define PANIC_FREQ (HZ / 8) 40#define PANIC_FREQ (HZ / 8)
diff --git a/arch/mips/sgi-ip32/ip32-reset.c b/arch/mips/sgi-ip32/ip32-reset.c
index ab9d9cef089e..79ddb4605659 100644
--- a/arch/mips/sgi-ip32/ip32-reset.c
+++ b/arch/mips/sgi-ip32/ip32-reset.c
@@ -28,13 +28,13 @@
28 28
29#define POWERDOWN_TIMEOUT 120 29#define POWERDOWN_TIMEOUT 120
30/* 30/*
31 * Blink frequency during reboot grace period and when paniced. 31 * Blink frequency during reboot grace period and when panicked.
32 */ 32 */
33#define POWERDOWN_FREQ (HZ / 4) 33#define POWERDOWN_FREQ (HZ / 4)
34#define PANIC_FREQ (HZ / 8) 34#define PANIC_FREQ (HZ / 8)
35 35
36static struct timer_list power_timer, blink_timer, debounce_timer; 36static struct timer_list power_timer, blink_timer, debounce_timer;
37static int has_paniced, shuting_down; 37static int has_panicked, shuting_down;
38 38
39static void ip32_machine_restart(char *command) __attribute__((noreturn)); 39static void ip32_machine_restart(char *command) __attribute__((noreturn));
40static void ip32_machine_halt(void) __attribute__((noreturn)); 40static void ip32_machine_halt(void) __attribute__((noreturn));
@@ -109,7 +109,7 @@ static void debounce(unsigned long data)
109 } 109 }
110 CMOS_WRITE(reg_a & ~DS_REGA_DV0, RTC_REG_A); 110 CMOS_WRITE(reg_a & ~DS_REGA_DV0, RTC_REG_A);
111 111
112 if (has_paniced) 112 if (has_panicked)
113 ip32_machine_restart(NULL); 113 ip32_machine_restart(NULL);
114 114
115 enable_irq(MACEISA_RTC_IRQ); 115 enable_irq(MACEISA_RTC_IRQ);
@@ -117,7 +117,7 @@ static void debounce(unsigned long data)
117 117
118static inline void ip32_power_button(void) 118static inline void ip32_power_button(void)
119{ 119{
120 if (has_paniced) 120 if (has_panicked)
121 return; 121 return;
122 122
123 if (shuting_down || kill_proc(1, SIGINT, 1)) { 123 if (shuting_down || kill_proc(1, SIGINT, 1)) {
@@ -161,9 +161,9 @@ static int panic_event(struct notifier_block *this, unsigned long event,
161{ 161{
162 unsigned long led; 162 unsigned long led;
163 163
164 if (has_paniced) 164 if (has_panicked)
165 return NOTIFY_DONE; 165 return NOTIFY_DONE;
166 has_paniced = 1; 166 has_panicked = 1;
167 167
168 /* turn off the green LED */ 168 /* turn off the green LED */
169 led = mace->perif.ctrl.misc | MACEISA_LED_GREEN; 169 led = mace->perif.ctrl.misc | MACEISA_LED_GREEN;
diff --git a/arch/powerpc/kernel/crash.c b/arch/powerpc/kernel/crash.c
index dbcb85994f46..e253a45dcf10 100644
--- a/arch/powerpc/kernel/crash.c
+++ b/arch/powerpc/kernel/crash.c
@@ -179,7 +179,7 @@ void default_machine_crash_shutdown(struct pt_regs *regs)
179 179
180 /* 180 /*
181 * This function is only called after the system 181 * This function is only called after the system
182 * has paniced or is otherwise in a critical state. 182 * has panicked or is otherwise in a critical state.
183 * The minimum amount of code to allow a kexec'd kernel 183 * The minimum amount of code to allow a kexec'd kernel
184 * to run successfully needs to happen here. 184 * to run successfully needs to happen here.
185 * 185 *
diff --git a/arch/powerpc/kernel/machine_kexec_32.c b/arch/powerpc/kernel/machine_kexec_32.c
index 443606134dff..cbaa34196797 100644
--- a/arch/powerpc/kernel/machine_kexec_32.c
+++ b/arch/powerpc/kernel/machine_kexec_32.c
@@ -30,8 +30,8 @@ typedef NORET_TYPE void (*relocate_new_kernel_t)(
30 */ 30 */
31void default_machine_kexec(struct kimage *image) 31void default_machine_kexec(struct kimage *image)
32{ 32{
33 const extern unsigned char relocate_new_kernel[]; 33 extern const unsigned char relocate_new_kernel[];
34 const extern unsigned int relocate_new_kernel_size; 34 extern const unsigned int relocate_new_kernel_size;
35 unsigned long page_list; 35 unsigned long page_list;
36 unsigned long reboot_code_buffer, reboot_code_buffer_phys; 36 unsigned long reboot_code_buffer, reboot_code_buffer_phys;
37 relocate_new_kernel_t rnk; 37 relocate_new_kernel_t rnk;
diff --git a/arch/powerpc/platforms/cell/spufs/switch.c b/arch/powerpc/platforms/cell/spufs/switch.c
index b30e55dab832..3068b429b031 100644
--- a/arch/powerpc/platforms/cell/spufs/switch.c
+++ b/arch/powerpc/platforms/cell/spufs/switch.c
@@ -2100,7 +2100,7 @@ EXPORT_SYMBOL_GPL(spu_save);
2100 * @spu: pointer to SPU iomem structure. 2100 * @spu: pointer to SPU iomem structure.
2101 * 2101 *
2102 * Perform harvest + restore, as we may not be coming 2102 * Perform harvest + restore, as we may not be coming
2103 * from a previous succesful save operation, and the 2103 * from a previous successful save operation, and the
2104 * hardware state is unknown. 2104 * hardware state is unknown.
2105 */ 2105 */
2106int spu_restore(struct spu_state *new, struct spu *spu) 2106int spu_restore(struct spu_state *new, struct spu *spu)
diff --git a/arch/powerpc/platforms/pseries/eeh_cache.c b/arch/powerpc/platforms/pseries/eeh_cache.c
index 98c23aec85be..c37a8497c60f 100644
--- a/arch/powerpc/platforms/pseries/eeh_cache.c
+++ b/arch/powerpc/platforms/pseries/eeh_cache.c
@@ -287,7 +287,7 @@ void pci_addr_cache_remove_device(struct pci_dev *dev)
287 * find the pci device that corresponds to a given address. 287 * find the pci device that corresponds to a given address.
288 * This routine scans all pci busses to build the cache. 288 * This routine scans all pci busses to build the cache.
289 * Must be run late in boot process, after the pci controllers 289 * Must be run late in boot process, after the pci controllers
290 * have been scaned for devices (after all device resources are known). 290 * have been scanned for devices (after all device resources are known).
291 */ 291 */
292void __init pci_addr_cache_build(void) 292void __init pci_addr_cache_build(void)
293{ 293{
diff --git a/arch/ppc/kernel/machine_kexec.c b/arch/ppc/kernel/machine_kexec.c
index 84d65a87191e..a469ba438cbe 100644
--- a/arch/ppc/kernel/machine_kexec.c
+++ b/arch/ppc/kernel/machine_kexec.c
@@ -25,8 +25,8 @@ typedef NORET_TYPE void (*relocate_new_kernel_t)(
25 unsigned long reboot_code_buffer, 25 unsigned long reboot_code_buffer,
26 unsigned long start_address) ATTRIB_NORET; 26 unsigned long start_address) ATTRIB_NORET;
27 27
28const extern unsigned char relocate_new_kernel[]; 28extern const unsigned char relocate_new_kernel[];
29const extern unsigned int relocate_new_kernel_size; 29extern const unsigned int relocate_new_kernel_size;
30 30
31void machine_shutdown(void) 31void machine_shutdown(void)
32{ 32{
diff --git a/arch/s390/kernel/machine_kexec.c b/arch/s390/kernel/machine_kexec.c
index bad81b5832db..fbde6a915264 100644
--- a/arch/s390/kernel/machine_kexec.c
+++ b/arch/s390/kernel/machine_kexec.c
@@ -27,8 +27,8 @@ static void kexec_halt_all_cpus(void *);
27 27
28typedef void (*relocate_kernel_t) (kimage_entry_t *, unsigned long); 28typedef void (*relocate_kernel_t) (kimage_entry_t *, unsigned long);
29 29
30const extern unsigned char relocate_kernel[]; 30extern const unsigned char relocate_kernel[];
31const extern unsigned long long relocate_kernel_len; 31extern const unsigned long long relocate_kernel_len;
32 32
33int 33int
34machine_kexec_prepare(struct kimage *image) 34machine_kexec_prepare(struct kimage *image)
diff --git a/arch/s390/kernel/vtime.c b/arch/s390/kernel/vtime.c
index dfe6f0856617..1f0439dc245a 100644
--- a/arch/s390/kernel/vtime.c
+++ b/arch/s390/kernel/vtime.c
@@ -356,7 +356,7 @@ static void internal_add_vtimer(struct vtimer_list *timer)
356 356
357 set_vtimer(event->expires); 357 set_vtimer(event->expires);
358 spin_unlock_irqrestore(&vt_list->lock, flags); 358 spin_unlock_irqrestore(&vt_list->lock, flags);
359 /* release CPU aquired in prepare_vtimer or mod_virt_timer() */ 359 /* release CPU acquired in prepare_vtimer or mod_virt_timer() */
360 put_cpu(); 360 put_cpu();
361} 361}
362 362
diff --git a/arch/sh/kernel/machine_kexec.c b/arch/sh/kernel/machine_kexec.c
index 43546525f28f..6bcd8d92399f 100644
--- a/arch/sh/kernel/machine_kexec.c
+++ b/arch/sh/kernel/machine_kexec.c
@@ -25,8 +25,8 @@ typedef NORET_TYPE void (*relocate_new_kernel_t)(
25 unsigned long start_address, 25 unsigned long start_address,
26 unsigned long vbr_reg) ATTRIB_NORET; 26 unsigned long vbr_reg) ATTRIB_NORET;
27 27
28const extern unsigned char relocate_new_kernel[]; 28extern const unsigned char relocate_new_kernel[];
29const extern unsigned int relocate_new_kernel_size; 29extern const unsigned int relocate_new_kernel_size;
30extern void *gdb_vbr_vector; 30extern void *gdb_vbr_vector;
31 31
32/* 32/*
diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
index 0897852b09a3..290cec6d69e2 100644
--- a/arch/um/drivers/ubd_kern.c
+++ b/arch/um/drivers/ubd_kern.c
@@ -1222,7 +1222,7 @@ int open_ubd_file(char *file, struct openflags *openflags, int shared,
1222 } 1222 }
1223 } 1223 }
1224 1224
1225 /* Succesful return case! */ 1225 /* Successful return case! */
1226 if(backing_file_out == NULL) 1226 if(backing_file_out == NULL)
1227 return(fd); 1227 return(fd);
1228 1228
diff --git a/arch/x86_64/kernel/crash.c b/arch/x86_64/kernel/crash.c
index 8ca04912b1cc..d8d5750d6106 100644
--- a/arch/x86_64/kernel/crash.c
+++ b/arch/x86_64/kernel/crash.c
@@ -161,7 +161,7 @@ void machine_crash_shutdown(struct pt_regs *regs)
161{ 161{
162 /* 162 /*
163 * This function is only called after the system 163 * This function is only called after the system
164 * has paniced or is otherwise in a critical state. 164 * has panicked or is otherwise in a critical state.
165 * The minimum amount of code to allow a kexec'd kernel 165 * The minimum amount of code to allow a kexec'd kernel
166 * to run successfully needs to happen here. 166 * to run successfully needs to happen here.
167 * 167 *
diff --git a/arch/x86_64/kernel/i8259.c b/arch/x86_64/kernel/i8259.c
index 9b1a4e147321..86b2c1e197aa 100644
--- a/arch/x86_64/kernel/i8259.c
+++ b/arch/x86_64/kernel/i8259.c
@@ -278,7 +278,7 @@ static void mask_and_ack_8259A(unsigned int irq)
278 * Lightweight spurious IRQ detection. We do not want 278 * Lightweight spurious IRQ detection. We do not want
279 * to overdo spurious IRQ handling - it's usually a sign 279 * to overdo spurious IRQ handling - it's usually a sign
280 * of hardware problems, so we only do the checks we can 280 * of hardware problems, so we only do the checks we can
281 * do without slowing down good hardware unnecesserily. 281 * do without slowing down good hardware unnecessarily.
282 * 282 *
283 * Note that IRQ7 and IRQ15 (the two spurious IRQs 283 * Note that IRQ7 and IRQ15 (the two spurious IRQs
284 * usually resulting from the 8259A-1|2 PICs) occur 284 * usually resulting from the 8259A-1|2 PICs) occur
diff --git a/arch/x86_64/kernel/machine_kexec.c b/arch/x86_64/kernel/machine_kexec.c
index 25ac8a3faae6..83fb24a02821 100644
--- a/arch/x86_64/kernel/machine_kexec.c
+++ b/arch/x86_64/kernel/machine_kexec.c
@@ -149,8 +149,8 @@ typedef NORET_TYPE void (*relocate_new_kernel_t)(unsigned long indirection_page,
149 unsigned long start_address, 149 unsigned long start_address,
150 unsigned long pgtable) ATTRIB_NORET; 150 unsigned long pgtable) ATTRIB_NORET;
151 151
152const extern unsigned char relocate_new_kernel[]; 152extern const unsigned char relocate_new_kernel[];
153const extern unsigned long relocate_new_kernel_size; 153extern const unsigned long relocate_new_kernel_size;
154 154
155int machine_kexec_prepare(struct kimage *image) 155int machine_kexec_prepare(struct kimage *image)
156{ 156{
diff --git a/arch/x86_64/kernel/smp.c b/arch/x86_64/kernel/smp.c
index 8188bae9c6d5..acee4bc3f6fa 100644
--- a/arch/x86_64/kernel/smp.c
+++ b/arch/x86_64/kernel/smp.c
@@ -474,7 +474,7 @@ void smp_send_stop(void)
474 return; 474 return;
475 /* Don't deadlock on the call lock in panic */ 475 /* Don't deadlock on the call lock in panic */
476 if (!spin_trylock(&call_lock)) { 476 if (!spin_trylock(&call_lock)) {
477 /* ignore locking because we have paniced anyways */ 477 /* ignore locking because we have panicked anyways */
478 nolock = 1; 478 nolock = 1;
479 } 479 }
480 __smp_call_function(smp_really_stop_cpu, NULL, 0, 0); 480 __smp_call_function(smp_really_stop_cpu, NULL, 0, 0);