From 8eb73691b16e82ba8cb1083f62768ffa0998415e Mon Sep 17 00:00:00 2001 From: Steven Cole Date: Mon, 21 Apr 2003 09:13:33 -0700 Subject: [PATCH] [SPARC64]: Spelling fixes. --- arch/sparc64/kernel/chmc.c | 2 +- arch/sparc64/kernel/entry.S | 2 +- arch/sparc64/kernel/head.S | 2 +- arch/sparc64/kernel/ioctl32.c | 2 +- arch/sparc64/kernel/pci_common.c | 2 +- arch/sparc64/kernel/pci_psycho.c | 2 +- arch/sparc64/kernel/ptrace.c | 2 +- arch/sparc64/kernel/rtrap.S | 2 +- arch/sparc64/kernel/sbus.c | 4 ++-- arch/sparc64/kernel/smp.c | 4 ++-- arch/sparc64/kernel/time.c | 4 ++-- arch/sparc64/kernel/trampoline.S | 2 +- arch/sparc64/prom/printf.c | 2 +- arch/sparc64/solaris/misc.c | 2 +- include/asm-sparc64/asi.h | 4 ++-- include/asm-sparc64/bpp.h | 2 +- include/asm-sparc64/chafsr.h | 4 ++-- include/asm-sparc64/estate.h | 4 ++-- include/asm-sparc64/ns87303.h | 4 ++-- include/asm-sparc64/pci.h | 4 ++-- include/asm-sparc64/svr4.h | 2 +- include/asm-sparc64/upa.h | 2 +- 22 files changed, 30 insertions(+), 30 deletions(-) diff --git a/arch/sparc64/kernel/chmc.c b/arch/sparc64/kernel/chmc.c index cf60773552d5f..6e39a101f7d82 100644 --- a/arch/sparc64/kernel/chmc.c +++ b/arch/sparc64/kernel/chmc.c @@ -224,7 +224,7 @@ int chmc_getunumber(int syndrome_code, int dimm; /* Multi-bit error, we just dump out all the - * dimm labels assosciated with this bank. + * dimm labels associated with this bank. */ for (dimm = 0; dimm < CHMCTRL_NDIMMS; dimm++) { sprintf(buf, "%s ", diff --git a/arch/sparc64/kernel/entry.S b/arch/sparc64/kernel/entry.S index 61fde72e8bc80..ea855f89b1c5e 100644 --- a/arch/sparc64/kernel/entry.S +++ b/arch/sparc64/kernel/entry.S @@ -1264,7 +1264,7 @@ dcpe_icpe_tl1_common: * because corrupt data may have been placed there and we don't * want to reference it. * - * %g1 is one if this trap occured at %tl >= 1. + * %g1 is one if this trap occurred at %tl >= 1. * * Next, we turn off error reporting so that we don't recurse. */ diff --git a/arch/sparc64/kernel/head.S b/arch/sparc64/kernel/head.S index 589b7c5237127..de9a04a8e47bb 100644 --- a/arch/sparc64/kernel/head.S +++ b/arch/sparc64/kernel/head.S @@ -84,7 +84,7 @@ sparc64_boot: nop cheetah_plus_boot: - /* Preserve OBP choosen DCU and DCR register settings. */ + /* Preserve OBP chosen DCU and DCR register settings. */ ba,pt %xcc, cheetah_generic_boot nop diff --git a/arch/sparc64/kernel/ioctl32.c b/arch/sparc64/kernel/ioctl32.c index dea7dcd929b93..c1fd36d1304f3 100644 --- a/arch/sparc64/kernel/ioctl32.c +++ b/arch/sparc64/kernel/ioctl32.c @@ -3137,7 +3137,7 @@ typedef struct drm32_dma { #define DRM32_IOCTL_DMA DRM_IOWR(0x29, drm32_dma_t) /* RED PEN The DRM layer blindly dereferences the send/request - * indice/size arrays even though they are userland + * index/size arrays even though they are userland * pointers. -DaveM */ static int drm32_dma(unsigned int fd, unsigned int cmd, unsigned long arg) diff --git a/arch/sparc64/kernel/pci_common.c b/arch/sparc64/kernel/pci_common.c index 496c75fd44799..474e630be843b 100644 --- a/arch/sparc64/kernel/pci_common.c +++ b/arch/sparc64/kernel/pci_common.c @@ -145,7 +145,7 @@ static void __init pdev_cookie_fillin(struct pci_pbm_info *pbm, * there must be a damn good reason for it. * * So what we do is delete the device from the - * PCI device tree completely. This scenerio + * PCI device tree completely. This scenario * is seen, for example, on CP1500 for the * second EBUS/HappyMeal pair if the external * connector for it is not present. diff --git a/arch/sparc64/kernel/pci_psycho.c b/arch/sparc64/kernel/pci_psycho.c index 80e0bac64ca52..15b5b6e40e056 100644 --- a/arch/sparc64/kernel/pci_psycho.c +++ b/arch/sparc64/kernel/pci_psycho.c @@ -854,7 +854,7 @@ static irqreturn_t psycho_ce_intr(int irq, void *dev_id, struct pt_regs *regs) } /* PCI Errors. They are signalled by the PCI bus module since they - * are assosciated with a specific bus segment. + * are associated with a specific bus segment. */ #define PSYCHO_PCI_AFSR_A 0x2010UL #define PSYCHO_PCI_AFSR_B 0x4010UL diff --git a/arch/sparc64/kernel/ptrace.c b/arch/sparc64/kernel/ptrace.c index e627070dc292b..d935eb602ce68 100644 --- a/arch/sparc64/kernel/ptrace.c +++ b/arch/sparc64/kernel/ptrace.c @@ -6,7 +6,7 @@ * Based upon code written by Ross Biro, Linus Torvalds, Bob Manson, * and David Mosberger. * - * Added Linux support -miguel (weird, eh?, the orignal code was meant + * Added Linux support -miguel (weird, eh?, the original code was meant * to emulate SunOS). */ diff --git a/arch/sparc64/kernel/rtrap.S b/arch/sparc64/kernel/rtrap.S index e2a6a3fca5d87..97f596873c0ac 100644 --- a/arch/sparc64/kernel/rtrap.S +++ b/arch/sparc64/kernel/rtrap.S @@ -210,7 +210,7 @@ __handle_user_windows_continue: __handle_perfctrs_continue: andcc %l1, %o0, %g0 - /* This fpdepth clear is neccessary for non-syscall rtraps only */ + /* This fpdepth clear is necessary for non-syscall rtraps only */ user_nowork: bne,pn %xcc, __handle_userfpu stb %g0, [%g6 + TI_FPDEPTH] diff --git a/arch/sparc64/kernel/sbus.c b/arch/sparc64/kernel/sbus.c index e6af19dd6754f..c6de3ad25176c 100644 --- a/arch/sparc64/kernel/sbus.c +++ b/arch/sparc64/kernel/sbus.c @@ -728,7 +728,7 @@ static unsigned long sysio_irq_offsets[] = { #define NUM_SYSIO_OFFSETS (sizeof(sysio_irq_offsets) / sizeof(sysio_irq_offsets[0])) -/* Convert Interrupt Mapping register pointer to assosciated +/* Convert Interrupt Mapping register pointer to associated * Interrupt Clear register pointer, SYSIO specific version. */ #define SYSIO_ICLR_UNUSED0 0x3400UL @@ -1098,7 +1098,7 @@ void __init sbus_iommu_init(int prom_node, struct sbus_bus *sbus) prom_halt(); } - /* Align on E$ line boundry. */ + /* Align on E$ line boundary. */ iommu = (struct sbus_iommu *) (((unsigned long)iommu + (SMP_CACHE_BYTES - 1UL)) & ~(SMP_CACHE_BYTES - 1UL)); diff --git a/arch/sparc64/kernel/smp.c b/arch/sparc64/kernel/smp.c index cf73f8df0f0dd..a5504b8991784 100644 --- a/arch/sparc64/kernel/smp.c +++ b/arch/sparc64/kernel/smp.c @@ -1071,7 +1071,7 @@ void smp_percpu_timer_interrupt(struct pt_regs *regs) prof_counter(cpu) = prof_multiplier(cpu); } - /* Guarentee that the following sequences execute + /* Guarantee that the following sequences execute * uninterrupted. */ __asm__ __volatile__("rdpr %%pstate, %0\n\t" @@ -1096,7 +1096,7 @@ static void __init smp_setup_percpu_timer(void) prof_counter(cpu) = prof_multiplier(cpu) = 1; - /* Guarentee that the following sequences execute + /* Guarantee that the following sequences execute * uninterrupted. */ __asm__ __volatile__("rdpr %%pstate, %0\n\t" diff --git a/arch/sparc64/kernel/time.c b/arch/sparc64/kernel/time.c index e54147679595b..25027085256f5 100644 --- a/arch/sparc64/kernel/time.c +++ b/arch/sparc64/kernel/time.c @@ -489,7 +489,7 @@ static irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs * regs) #endif do_timer(regs); - /* Guarentee that the following sequences execute + /* Guarantee that the following sequences execute * uninterrupted. */ __asm__ __volatile__("rdpr %%pstate, %0\n\t" @@ -972,7 +972,7 @@ static unsigned long sparc64_init_timers(irqreturn_t (*cfunc)(int, void *, struc prom_halt(); } - /* Guarentee that the following sequences execute + /* Guarantee that the following sequences execute * uninterrupted. */ __asm__ __volatile__("rdpr %%pstate, %0\n\t" diff --git a/arch/sparc64/kernel/trampoline.S b/arch/sparc64/kernel/trampoline.S index 5291251cb7a9d..8b4cbd401be3f 100644 --- a/arch/sparc64/kernel/trampoline.S +++ b/arch/sparc64/kernel/trampoline.S @@ -40,7 +40,7 @@ sparc64_cpu_startup: nop cheetah_plus_startup: - /* Preserve OBP choosen DCU and DCR register settings. */ + /* Preserve OBP chosen DCU and DCR register settings. */ ba,pt %xcc, cheetah_generic_startup nop diff --git a/arch/sparc64/prom/printf.c b/arch/sparc64/prom/printf.c index 01b26a70cd677..b4c7ad8cb7804 100644 --- a/arch/sparc64/prom/printf.c +++ b/arch/sparc64/prom/printf.c @@ -6,7 +6,7 @@ * Copyright (c) 2002 Pete Zaitcev (zaitcev@yahoo.com) * * We used to warn all over the code: DO NOT USE prom_printf(), - * and yet people do. Anton's banking code was outputing banks + * and yet people do. Anton's banking code was outputting banks * with prom_printf for most of the 2.4 lifetime. Since an effective * stick is not available, we deployed a carrot: an early printk * through PROM by means of -p boot option. This ought to fix it. diff --git a/arch/sparc64/solaris/misc.c b/arch/sparc64/solaris/misc.c index 6f9485fc54228..369cbd3040c69 100644 --- a/arch/sparc64/solaris/misc.c +++ b/arch/sparc64/solaris/misc.c @@ -1,5 +1,5 @@ /* $Id: misc.c,v 1.36 2002/02/09 19:49:31 davem Exp $ - * misc.c: Miscelaneous syscall emulation for Solaris + * misc.c: Miscellaneous syscall emulation for Solaris * * Copyright (C) 1997,1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz) */ diff --git a/include/asm-sparc64/asi.h b/include/asm-sparc64/asi.h index b69ab57d06914..d0796a10c2221 100644 --- a/include/asm-sparc64/asi.h +++ b/include/asm-sparc64/asi.h @@ -102,13 +102,13 @@ #define ASI_PST8_P 0xc0 /* Primary, 8 8-bit, partial */ #define ASI_PST8_S 0xc1 /* Secondary, 8 8-bit, partial */ #define ASI_PST16_P 0xc2 /* Primary, 4 16-bit, partial */ -#define ASI_PST16_S 0xc3 /* Seconary, 4 16-bit, partial */ +#define ASI_PST16_S 0xc3 /* Secondary, 4 16-bit, partial */ #define ASI_PST32_P 0xc4 /* Primary, 2 32-bit, partial */ #define ASI_PST32_S 0xc5 /* Secondary, 2 32-bit, partial */ #define ASI_PST8_PL 0xc8 /* Primary, 8 8-bit, partial, little */ #define ASI_PST8_SL 0xc9 /* Secondary, 8 8-bit, partial, little */ #define ASI_PST16_PL 0xca /* Primary, 4 16-bit, partial, little */ -#define ASI_PST16_SL 0xcb /* Seconary, 4 16-bit, partial, little */ +#define ASI_PST16_SL 0xcb /* Secondary, 4 16-bit, partial, little */ #define ASI_PST32_PL 0xcc /* Primary, 2 32-bit, partial, little */ #define ASI_PST32_SL 0xcd /* Secondary, 2 32-bit, partial, little */ #define ASI_FL8_P 0xd0 /* Primary, 1 8-bit, fpu ld/st */ diff --git a/include/asm-sparc64/bpp.h b/include/asm-sparc64/bpp.h index eb86015ee6388..9b12a088a60aa 100644 --- a/include/asm-sparc64/bpp.h +++ b/include/asm-sparc64/bpp.h @@ -17,7 +17,7 @@ * with compliant or compatible devices. It will use whatever features * the device supports, prefering those that are typically faster. * - * When the device is opened, it is left in COMPATABILITY mode, and + * When the device is opened, it is left in COMPATIBILITY mode, and * writes work like any printer device. The driver only attempt to * negotiate 1284 modes when needed so that plugs can be pulled, * switch boxes switched, etc., without disrupting things. It will diff --git a/include/asm-sparc64/chafsr.h b/include/asm-sparc64/chafsr.h index a3d286a4a387a..bea68da7dd2d3 100644 --- a/include/asm-sparc64/chafsr.h +++ b/include/asm-sparc64/chafsr.h @@ -61,7 +61,7 @@ /* Uncorrectable system bus data ECC error for read of interrupt vector */ #define CHAFSR_IVU 0x0000200000000000 -/* Unmappeed error from system bus */ +/* Unmapped error from system bus */ #define CHAFSR_TO 0x0000100000000000 /* Bus error response from system bus */ @@ -127,7 +127,7 @@ /* The AFSR must be explicitly cleared by software, it is not cleared automatically * by a read. Writes to bits <51:33> with bits set will clear the corresponding - * bits in the AFSR. Bits assosciated with disrupting traps must be cleared before + * bits in the AFSR. Bits associated with disrupting traps must be cleared before * interrupts are re-enabled to prevent multiple traps for the same error. I.e. * PSTATE.IE and AFSR bits control delivery of disrupting traps. * diff --git a/include/asm-sparc64/estate.h b/include/asm-sparc64/estate.h index d26ccb71b4c55..a719c3d2f6b1e 100644 --- a/include/asm-sparc64/estate.h +++ b/include/asm-sparc64/estate.h @@ -15,7 +15,7 @@ * errors 2) uncorrectable E-cache errors. Such events only occur on reads * of the E-cache by the local processor for: 1) data loads 2) instruction * fetches 3) atomic operations. Such events _cannot_ occur for: 1) merge - * 2) writeback 2) copyout. The AFSR bits assosciated with these traps are + * 2) writeback 2) copyout. The AFSR bits associated with these traps are * UCC and UCU. */ @@ -31,7 +31,7 @@ * 4) As the result of such errors on instruction vector fetch can generate any * of the 3 trap types. * - * The AFSR bits assosciated with these traps are EMU, EDU, WDU, CPU, IVU, UE, + * The AFSR bits associated with these traps are EMU, EDU, WDU, CPU, IVU, UE, * BERR, and TO. */ diff --git a/include/asm-sparc64/ns87303.h b/include/asm-sparc64/ns87303.h index fee7d95e54d5b..6d58fdf349b52 100644 --- a/include/asm-sparc64/ns87303.h +++ b/include/asm-sparc64/ns87303.h @@ -9,7 +9,7 @@ #define _SPARC_NS87303_H 1 /* - * Controll Register Index Values + * Control Register Index Values */ #define FER 0x00 #define FAR 0x01 @@ -58,7 +58,7 @@ #define TUP_EPP_TIMO 0x02 /* Enable EPP timeout IRQ */ /* Advanced SuperIO Config Register (ASC) bits */ -#define ASC_LPT_IRQ7 0x01 /* Allways use IRQ7 for LPT */ +#define ASC_LPT_IRQ7 0x01 /* Always use IRQ7 for LPT */ #define ASC_DRV2_SEL 0x02 /* Logical Drive Exchange controlled by TDR */ #define FER_RESERVED 0x00 diff --git a/include/asm-sparc64/pci.h b/include/asm-sparc64/pci.h index 137405b1af752..3ca47369b2b15 100644 --- a/include/asm-sparc64/pci.h +++ b/include/asm-sparc64/pci.h @@ -50,7 +50,7 @@ extern void *pci_alloc_consistent(struct pci_dev *hwdev, size_t size, dma_addr_t * size must be the same as what as passed into pci_alloc_consistent, * and likewise dma_addr must be the same as what *dma_addrp was set to. * - * References to the memory and mappings assosciated with cpu_addr/dma_addr + * References to the memory and mappings associated with cpu_addr/dma_addr * past this call are illegal. */ extern void pci_free_consistent(struct pci_dev *hwdev, size_t size, void *vaddr, dma_addr_t dma_handle); @@ -92,7 +92,7 @@ extern void pci_unmap_single(struct pci_dev *hwdev, dma_addr_t dma_addr, size_t (((PTR)->LEN_NAME) = (VAL)) /* Map a set of buffers described by scatterlist in streaming - * mode for DMA. This is the scather-gather version of the + * mode for DMA. This is the scatter-gather version of the * above pci_map_single interface. Here the scatter gather list * elements are each tagged with the appropriate dma address * and length. They are obtained via sg_dma_{address,length}(SG). diff --git a/include/asm-sparc64/svr4.h b/include/asm-sparc64/svr4.h index fbf94c2e26790..1a65c064c65db 100644 --- a/include/asm-sparc64/svr4.h +++ b/include/asm-sparc64/svr4.h @@ -85,7 +85,7 @@ enum svr4_stack_flags { SVR4_SS_DISABLE, }; -/* signal stack exection place, unsupported */ +/* signal stack execution place, unsupported */ typedef struct svr4_stack_t { char *sp; int size; diff --git a/include/asm-sparc64/upa.h b/include/asm-sparc64/upa.h index 245b85b13a8d3..7ae09a22e4087 100644 --- a/include/asm-sparc64/upa.h +++ b/include/asm-sparc64/upa.h @@ -21,7 +21,7 @@ #define UPA_PORTID_PREQDQ 0x000000007e000000 /* slave-wr's to mod supported */ #define UPA_PORTID_PREQRD 0x0000000001e00000 /* # incoming P_REQ's supported */ #define UPA_PORTID_UPACAP 0x00000000001f0000 /* UPA capabilities of mod */ -#define UPA_PORTID_ID 0x000000000000ffff /* Module Indentification bits */ +#define UPA_PORTID_ID 0x000000000000ffff /* Module Identification bits */ /* UPA I/O space accessors */ #if defined(__KERNEL__) && !defined(__ASSEMBLY__) -- 2.53.0