aboutsummaryrefslogtreecommitdiffstats
path: root/arch/alpha
diff options
context:
space:
mode:
Diffstat (limited to 'arch/alpha')
-rw-r--r--arch/alpha/kernel/err_marvel.c2
-rw-r--r--arch/alpha/kernel/err_titan.c2
-rw-r--r--arch/alpha/kernel/osf_sys.c2
-rw-r--r--arch/alpha/kernel/smp.c1
-rw-r--r--arch/alpha/kernel/sys_alcor.c2
-rw-r--r--arch/alpha/kernel/sys_sio.c2
-rw-r--r--arch/alpha/lib/checksum.c2
-rw-r--r--arch/alpha/lib/csum_partial_copy.c2
-rw-r--r--arch/alpha/mm/init.c2
-rw-r--r--arch/alpha/oprofile/op_impl.h2
10 files changed, 9 insertions, 10 deletions
diff --git a/arch/alpha/kernel/err_marvel.c b/arch/alpha/kernel/err_marvel.c
index f2956ac8dccc..497877bf2012 100644
--- a/arch/alpha/kernel/err_marvel.c
+++ b/arch/alpha/kernel/err_marvel.c
@@ -1082,7 +1082,7 @@ marvel_machine_check(u64 vector, u64 la_ptr)
1082 } 1082 }
1083 1083
1084 /* 1084 /*
1085 * A system event or error has occured, handle it here. 1085 * A system event or error has occurred, handle it here.
1086 * 1086 *
1087 * Any errors in the logout frame have already been cleared by the 1087 * Any errors in the logout frame have already been cleared by the
1088 * PALcode, so just parse it. 1088 * PALcode, so just parse it.
diff --git a/arch/alpha/kernel/err_titan.c b/arch/alpha/kernel/err_titan.c
index 543d96d7fa2b..6f3867877d9e 100644
--- a/arch/alpha/kernel/err_titan.c
+++ b/arch/alpha/kernel/err_titan.c
@@ -591,7 +591,7 @@ privateer_process_680_frame(struct el_common *mchk_header, int print)
591 (struct el_PRIVATEER_envdata_mcheck *) 591 (struct el_PRIVATEER_envdata_mcheck *)
592 ((unsigned long)mchk_header + mchk_header->sys_offset); 592 ((unsigned long)mchk_header + mchk_header->sys_offset);
593 593
594 /* TODO - catagorize errors, for now, no error */ 594 /* TODO - categorize errors, for now, no error */
595 595
596 if (!print) 596 if (!print)
597 return status; 597 return status;
diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
index ce857158c1ea..6413c5f23226 100644
--- a/arch/alpha/kernel/osf_sys.c
+++ b/arch/alpha/kernel/osf_sys.c
@@ -715,7 +715,7 @@ osf_setsysinfo(unsigned long op, void __user *buffer, unsigned long nbytes,
715 /* 715 /*
716 * Alpha Architecture Handbook 4.7.7.3: 716 * Alpha Architecture Handbook 4.7.7.3:
717 * To be fully IEEE compiant, we must track the current IEEE 717 * To be fully IEEE compiant, we must track the current IEEE
718 * exception state in software, because spurrious bits can be 718 * exception state in software, because spurious bits can be
719 * set in the trap shadow of a software-complete insn. 719 * set in the trap shadow of a software-complete insn.
720 */ 720 */
721 721
diff --git a/arch/alpha/kernel/smp.c b/arch/alpha/kernel/smp.c
index ad176441be55..f4ab233201b2 100644
--- a/arch/alpha/kernel/smp.c
+++ b/arch/alpha/kernel/smp.c
@@ -439,7 +439,6 @@ setup_smp(void)
439 ((char *)cpubase + i*hwrpb->processor_size); 439 ((char *)cpubase + i*hwrpb->processor_size);
440 if ((cpu->flags & 0x1cc) == 0x1cc) { 440 if ((cpu->flags & 0x1cc) == 0x1cc) {
441 smp_num_probed++; 441 smp_num_probed++;
442 /* Assume here that "whami" == index */
443 cpu_set(i, cpu_present_map); 442 cpu_set(i, cpu_present_map);
444 cpu->pal_revision = boot_cpu_palrev; 443 cpu->pal_revision = boot_cpu_palrev;
445 } 444 }
diff --git a/arch/alpha/kernel/sys_alcor.c b/arch/alpha/kernel/sys_alcor.c
index 49bedfbbd31b..d187d01d2a17 100644
--- a/arch/alpha/kernel/sys_alcor.c
+++ b/arch/alpha/kernel/sys_alcor.c
@@ -138,7 +138,7 @@ alcor_init_irq(void)
138 138
139 for (i = 16; i < 48; ++i) { 139 for (i = 16; i < 48; ++i) {
140 /* On Alcor, at least, lines 20..30 are not connected 140 /* On Alcor, at least, lines 20..30 are not connected
141 and can generate spurrious interrupts if we turn them 141 and can generate spurious interrupts if we turn them
142 on while IRQ probing. */ 142 on while IRQ probing. */
143 if (i >= 16+20 && i <= 16+30) 143 if (i >= 16+20 && i <= 16+30)
144 continue; 144 continue;
diff --git a/arch/alpha/kernel/sys_sio.c b/arch/alpha/kernel/sys_sio.c
index 14b5a753aba5..ee7b9009ebb4 100644
--- a/arch/alpha/kernel/sys_sio.c
+++ b/arch/alpha/kernel/sys_sio.c
@@ -78,7 +78,7 @@ alphabook1_init_arch(void)
78 * example, sound boards seem to like using IRQ 9. 78 * example, sound boards seem to like using IRQ 9.
79 * 79 *
80 * This is NOT how we should do it. PIRQ0-X should have 80 * This is NOT how we should do it. PIRQ0-X should have
81 * their own IRQ's, the way intel uses the IO-APIC irq's. 81 * their own IRQs, the way intel uses the IO-APIC IRQs.
82 */ 82 */
83 83
84static void __init 84static void __init
diff --git a/arch/alpha/lib/checksum.c b/arch/alpha/lib/checksum.c
index 8698e0746f9f..199f6efa83fa 100644
--- a/arch/alpha/lib/checksum.c
+++ b/arch/alpha/lib/checksum.c
@@ -5,7 +5,7 @@
5 * in an architecture-specific manner due to speed.. 5 * in an architecture-specific manner due to speed..
6 * Comments in other versions indicate that the algorithms are from RFC1071 6 * Comments in other versions indicate that the algorithms are from RFC1071
7 * 7 *
8 * accellerated versions (and 21264 assembly versions ) contributed by 8 * accelerated versions (and 21264 assembly versions ) contributed by
9 * Rick Gorton <rick.gorton@alpha-processor.com> 9 * Rick Gorton <rick.gorton@alpha-processor.com>
10 */ 10 */
11 11
diff --git a/arch/alpha/lib/csum_partial_copy.c b/arch/alpha/lib/csum_partial_copy.c
index 4ca75c74ce90..40736da9bea8 100644
--- a/arch/alpha/lib/csum_partial_copy.c
+++ b/arch/alpha/lib/csum_partial_copy.c
@@ -2,7 +2,7 @@
2 * csum_partial_copy - do IP checksumming and copy 2 * csum_partial_copy - do IP checksumming and copy
3 * 3 *
4 * (C) Copyright 1996 Linus Torvalds 4 * (C) Copyright 1996 Linus Torvalds
5 * accellerated versions (and 21264 assembly versions ) contributed by 5 * accelerated versions (and 21264 assembly versions ) contributed by
6 * Rick Gorton <rick.gorton@alpha-processor.com> 6 * Rick Gorton <rick.gorton@alpha-processor.com>
7 * 7 *
8 * Don't look at this too closely - you'll go mad. The things 8 * Don't look at this too closely - you'll go mad. The things
diff --git a/arch/alpha/mm/init.c b/arch/alpha/mm/init.c
index 5e6da47779a4..40c15e7301de 100644
--- a/arch/alpha/mm/init.c
+++ b/arch/alpha/mm/init.c
@@ -235,7 +235,7 @@ callback_init(void * kernel_end)
235 unsigned long pfn = crb->map[i].pa >> PAGE_SHIFT; 235 unsigned long pfn = crb->map[i].pa >> PAGE_SHIFT;
236 crb->map[i].va = vaddr; 236 crb->map[i].va = vaddr;
237 for (j = 0; j < crb->map[i].count; ++j) { 237 for (j = 0; j < crb->map[i].count; ++j) {
238 /* Newer console's (especially on larger 238 /* Newer consoles (especially on larger
239 systems) may require more pages of 239 systems) may require more pages of
240 PTEs. Grab additional pages as needed. */ 240 PTEs. Grab additional pages as needed. */
241 if (pmd != pmd_offset(pgd, vaddr)) { 241 if (pmd != pmd_offset(pgd, vaddr)) {
diff --git a/arch/alpha/oprofile/op_impl.h b/arch/alpha/oprofile/op_impl.h
index 6b97893c1a80..b2b87ae9a353 100644
--- a/arch/alpha/oprofile/op_impl.h
+++ b/arch/alpha/oprofile/op_impl.h
@@ -38,7 +38,7 @@ struct op_register_config {
38 unsigned long need_reset; 38 unsigned long need_reset;
39}; 39};
40 40
41/* Per-architecture configury and hooks. */ 41/* Per-architecture configuration and hooks. */
42struct op_axp_model { 42struct op_axp_model {
43 void (*reg_setup) (struct op_register_config *, 43 void (*reg_setup) (struct op_register_config *,
44 struct op_counter_config *, 44 struct op_counter_config *,