Date: Thu, 18 Jun 1998 14:03:41 +0200 From: Jes Sorensen To: linux-m68k@lists.linux-m68k.org Subject: L68K: spelling stuff Sender: owner-linux-m68k@phil.uni-sb.de Hi FYI - this didn't make it to .106. Jes ------- start of forwarded message ------- From: Trevor Johnson To: Jes.Sorensen@cern.ch Subject: spelling fixes for m68k Date: Wed, 17 Jun 1998 21:56:22 -0700 (PDT) diff -ur linux/Documentation/m68k/framebuffer.txt linux-2.1.106-local/Documentation/m68k/framebuffer.txt --- linux/Documentation/m68k/framebuffer.txt Wed Jun 3 12:39:40 1998 +++ linux-2.1.106-local/Documentation/m68k/framebuffer.txt Wed Jun 17 21:02:32 1998 @@ -1,4 +1,3 @@ - The Linux/m68k Frame Buffer Device ---------------------------------- @@ -160,11 +159,11 @@ 5. Video Mode Timings --------------------- -A monitor draws an image on the screen by using an electron beam (3 electron -beams for most color models, 1 electron beam for Trinitron color monitors and -monochrone monitors). The front of the screen is covered by a pattern of -colored phospors (pixels). If a phospor is hit by an electron, it emits a -photon and thus becomes visible. +A monitor draws an image on the screen by using an electron beam (three +electron beams for most color models, one electron beam for Trinitron color +monitors and monochrome monitors). The front of the screen is covered by a +pattern of colored phosphors (pixels). If a phosphor is hit by an electron, it +emits a photon and thus becomes visible. The electron beam draws horizontal lines (scanlines) from left to right, and from the top to the bottom of the screen. By modifying the intensity of the @@ -278,7 +277,7 @@ 1) Pixelclock: xfree: in MHz - fb: In Picoseconds (ps) + fb: in picoseconds (ps) pixclock = 1000000 / DCF diff -ur linux/Documentation/m68k/kernel-options.txt linux-2.1.106-local/Documentation/m68k/kernel-options.txt --- linux/Documentation/m68k/kernel-options.txt Tue Apr 28 14:22:04 1998 +++ linux-2.1.106-local/Documentation/m68k/kernel-options.txt Wed Jun 17 21:02:33 1998 @@ -1,5 +1,3 @@ - - Command Line Options for Linux/m68k =================================== @@ -14,7 +12,7 @@ Often I've been asked which command line options the Linux/m68k kernel understands, or how the exact syntax for the ... option is, or ... about the option ... . I hope, this document supplies all the -answers... +answers. Note that some options might be outdated, their descriptions being incomplete or missing. Please update the information and send in the @@ -110,20 +108,19 @@ [Strange and maybe uninteresting stuff ON] This unusual translation of device names has some strange -consequences: If, for example, you have a symbolic link from /dev/fd +consequences: if, for example, you have a symbolic link from /dev/fd to /dev/fd0D720 as an abbreviation for floppy driver #0 in DD format, you cannot use this name for specifying the root device, because the kernel cannot see this symlink before mounting the root FS and it isn't in the table above. If you use it, the root device will not be -set at all, without an error message. Another example: You cannot use a +set at all, without an error message. Another example: you cannot use a partition on e.g. the sixth SCSI disk as the root filesystem, if you want to specify it by name. This is, because only the devices up to -/dev/sde are in the table above, but not /dev/sdf. Although, you can -use the sixth SCSI disk for the root FS, but you have to specify the -device by number... (see below). Or, even more strange, you can use the -fact that there is no range checking of the partition number, and your -knowledge that each disk uses 16 minors, and write "root=/dev/sde17" -(for /dev/sdf1). +/dev/sde are in the table above, but not /dev/sdf. You can use the sixth +SCSI disk for the root filesystem, but you have to specify the device by +number (see below). Even more strange, you can use the fact that there is +no range checking of the partition number, and your knowledge that each +disk uses 16 minors, and write "root=/dev/sde17" (for /dev/sdf1). [Strange and maybe uninteresting stuff OFF] @@ -181,7 +178,7 @@ Devices possible for Amiga: - "ser": built-in serial port; parameters: 9600bps, 8N1 - - "mem": Save the messages to a reserved area in chip mem. After + - "mem": Save the messages to a reserved area in chip memory. After rebooting, they can be read under AmigaOS with the tool 'dmesg'. @@ -205,7 +202,7 @@ Syntax: ramdisk= This option instructs the kernel to set up a ramdisk of the given -size in KBytes. Do not use this option if the ramdisk contents are +size in kilobytes. Do not use this option if the ramdisk contents are passed by bootstrap! In this case, the size is selected automatically and should not be overwritten. @@ -247,10 +244,10 @@ drivers/net/Space.c in the Linux source. Most prominent are eth0, ... eth3, sl0, ... sl3, ppp0, ..., ppp3, dummy, and lo. - The non-ethernet drivers (sl, ppp, dummy, lo) obviously ignore the -settings by this options. Also, the existing ethernet drivers for + The non-Ethernet drivers (sl, ppp, dummy, lo) obviously ignore the +settings by this options. Also, the existing Ethernet drivers for Linux/m68k (ariadne, a2065, hydra) don't use them because Zorro boards -are really Plug-'n-Play, so the "ether=" option is useless altogether +are really Plug-'n'-Play, so the "ether=" option is useless altogether for Linux/m68k. @@ -301,8 +298,8 @@ to use (minimum 4, default 4), is the size of each buffer in kilobytes (minimum 4, default 32) and says how much percent of error will be tolerated when setting a frequency -(maximum 10, default 0). For example with 3% you can play 8000Hz -AU-Files on the Falcon with its hardware frequency of 8195Hz and thus +(maximum 10, default 0). For example, with 3% you can play 8000 Hz Sun +audio files on the Falcon with its hardware frequency of 8195 Hz and thus don't need to expand the sound. @@ -495,7 +492,7 @@ xres_virtual must be set to 2048. For ET4000, xres_virtual depends on the initialisation of the video-card. If you're missing a corresponding yres_virtual: the external part is legacy, -therefore we don't support hardware-dependend functions like hardware-scroll, +therefore we don't support hardware-dependent functions like hardware scroll, panning or blanking. 4.1.7) eclock: @@ -617,7 +614,7 @@ Legal values are between 0 and 255. Default: 255/0. Note: This value is forced to 0 on a Falcon, since scatter-gather isn't possible with the ST-DMA. Not using scatter-gather hurts - perfomance significantly. + performance significantly. : The SCSI ID to be used by the initiator (your Atari). This is @@ -666,7 +663,7 @@ "ov_midi", ... These options are meant for switching on an OverScan video extension. The difference to the bare option is that the switch-on is done after video initialization, and somehow synchronized -to the HBLANK. A speciality is that ov_ikbd and ov_midi are switched +to the HBLANK. A specialty is that ov_ikbd and ov_midi are switched off before rebooting, so that OverScan is disabled and TOS boots correctly. @@ -749,8 +746,8 @@ - vga70 : 640x400, 31 kHz, 70 Hz Please notice that the ECS and VGA modes require either an ECS or AGA -chipset, and that these modes are limited to 2-bit color for the ECS -chipset and 8-bit color for the AGA chipset. +chip set, and that these modes are limited to 2-bit color for the ECS +chip set and 8-bit color for the AGA chip set. 5.1.2) depth ------------ @@ -851,11 +848,11 @@ Syntax: clock:x x = clock input in MHz for WD33c93 chip. Normal values would be from -8 through 20. The default value depends on your hostadapter(s), +8 through 20. The default value depends on your host adapter(s), default for the A3000 internal controller is 14, for the A2091 it's 8 -and for the GVP hostadapters it's either 8 or 14, depending on the -hostadapter and the SCSI-clock jumper present on some GVP -hostadapters. +and for the GVP host adapters it's either 8 or 14, depending on the +host adapter and the SCSI-clock jumper present on some GVP +host adapters. 5.3.6) next ----------- @@ -884,8 +881,8 @@ The earlier versions of the GVP driver did not handle DMA address-mask settings correctly which made it necessary for some people to use this option, in order to get their GVP controller -running under Linux. These problems have hopefully been solved and the -use of this option is now highly unrecommended! +running under Linux. These problems should now be solved and +further use of this option is highly discouraged! Incorrect use can lead to unpredictable behavior, so please only use this option if you *know* what you are doing and have a reason to do diff -ur linux/arch/m68k/amiga/amiints.c linux-2.1.106-local/arch/m68k/amiga/amiints.c --- linux/arch/m68k/amiga/amiints.c Thu Feb 12 16:30:12 1998 +++ linux-2.1.106-local/arch/m68k/amiga/amiints.c Wed Jun 17 21:02:46 1998 @@ -5,17 +5,17 @@ * License. See the file COPYING in the main directory of this archive * for more details. * - * 11/07/96: rewritten interrupt handling, irq lists are exists now only for - * this sources where it makes sense (VERTB/PORTS/EXTER) and you must - * be careful that dev_id for this sources is unique since this the - * only possibility to distinguish between different handlers for - * free_irq. irq lists also have different irq flags: + * 11/07/96: rewritten interrupt handling, IRQ lists exist now only for + * this source where it makes sense (VERTB/PORTS/EXTER) and you must + * be careful that dev_id for this source is unique since it is + * only possibile to distinguish between different handlers for + * free_irq. IRQ lists also have different IRQ flags: * - IRQ_FLG_FAST: handler is inserted at top of list (after other * fast handlers) * - IRQ_FLG_SLOW: handler is inserted at bottom of list and before - * they're executed irq level is set to the previous + * their executed IRQ level is set to the previous * one, but handlers don't need to be reentrant, if - * reentrance occured, slow handlers will be just + * reentrance occurred, slow handlers will be just * called again. * The whole interrupt handling for CIAs is moved to cia.c * /Roman Zippel @@ -360,7 +360,7 @@ for (;;) { for (; node; node = node->next) node->handler(irq, node->dev_id, fp); - /* if reentrance occured, serve slow handlers again */ + /* if reentrance occurred, serve slow handlers again */ custom.intena = ami_intena_vals[irq]; if (!server->reentrance) { server->count--; diff -ur linux/arch/m68k/apollo/dn_ints.c linux-2.1.106-local/arch/m68k/apollo/dn_ints.c --- linux/arch/m68k/apollo/dn_ints.c Thu Feb 12 16:30:12 1998 +++ linux-2.1.106-local/arch/m68k/apollo/dn_ints.c Wed Jun 17 21:02:46 1998 @@ -30,7 +30,7 @@ dn_irqs[irq-160].handler(irq,dn_irqs[irq-160].dev_id,fp); } else { - printk("spurious irq %d occured\n",irq); + printk("spurious IRQ %d occurred\n",irq); } #if 0 diff -ur linux/arch/m68k/config.in linux-2.1.106-local/arch/m68k/config.in --- linux/arch/m68k/config.in Sat Jun 13 13:14:32 1998 +++ linux-2.1.106-local/arch/m68k/config.in Wed Jun 17 21:02:46 1998 @@ -215,7 +215,7 @@ fi fi if [ "$CONFIG_MAC" = "y" ]; then - bool 'Mac NS 8390 based ethernet cards' CONFIG_DAYNAPORT + bool 'Mac NS 8390 based Ethernet cards' CONFIG_DAYNAPORT fi if [ "$CONFIG_VME" = "y" -a "$CONFIG_MVME16x" = "y" ]; then bool 'MVME16x Ethernet support' CONFIG_APRICOT diff -ur linux/arch/m68k/defconfig linux-2.1.106-local/arch/m68k/defconfig --- linux/arch/m68k/defconfig Sat Jun 13 13:14:32 1998 +++ linux-2.1.106-local/arch/m68k/defconfig Wed Jun 17 21:02:47 1998 @@ -108,7 +108,7 @@ CONFIG_SCSI=y # -# SCSI support type (disk, tape, CDrom) +# SCSI support type (disk, tape, CDROM) # CONFIG_BLK_DEV_SD=y CONFIG_CHR_DEV_ST=y diff -ur linux/arch/m68k/fpsp040/bindec.S linux-2.1.106-local/arch/m68k/fpsp040/bindec.S --- linux/arch/m68k/fpsp040/bindec.S Fri Apr 26 02:12:35 1996 +++ linux-2.1.106-local/arch/m68k/fpsp040/bindec.S Wed Jun 17 21:02:47 1998 @@ -410,7 +410,7 @@ leal RBDTBL,%a2 |load rbdtbl base moveb (%a2,%d1),%d3 |load d3 with new rmode lsll #4,%d3 |put bits in proper position - fmovel %d3,%fpcr |load bits into fpu + fmovel %d3,%fpcr |load bits into FPU lsrl #4,%d3 |put bits in proper position tstb %d3 |decode new rmode for pten table bnes not_rn |if zero, it is RN @@ -458,7 +458,7 @@ | with a multiply by 10^8 and 10^16, which is exact since | 10^24 is exact. If the input was denormalized, we must | create a busy stack frame with the mul command and the -| two operands, and allow the fpu to complete the multiply. +| two operands, and allow the FPU to complete the multiply. | | Register usage: | Input/Output @@ -504,7 +504,7 @@ moveb #0x10,0x44(%a7) |set fcefpte[15] bit movew #0x0023,0x40(%a7) |load cmdreg1b with mul command moveb #0xfe,0x8(%a7) |load all 1s to cu savepc - frestore (%a7)+ |restore frame to fpu for completion + frestore (%a7)+ |restore frame to FPU for completion fmulx 36(%a1),%fp0 |multiply fp0 by 10^8 fmulx 48(%a1),%fp0 |multiply fp0 by 10^16 bras A10_st @@ -544,7 +544,7 @@ btstl #9,%d0 |check if INEX2 set beqs A11_st |if clear, skip rest oril #1,8(%a2) |or in 1 to lsb of mantissa - fmovex FP_SCR2(%a6),%fp0 |write adjusted Y back to fpu + fmovex FP_SCR2(%a6),%fp0 |write adjusted Y back to FPU | A11. Restore original FPCR; set size ext. diff -ur linux/arch/m68k/fpsp040/bugfix.S linux-2.1.106-local/arch/m68k/fpsp040/bugfix.S --- linux/arch/m68k/fpsp040/bugfix.S Tue Apr 23 21:31:24 1996 +++ linux-2.1.106-local/arch/m68k/fpsp040/bugfix.S Wed Jun 17 21:02:47 1998 @@ -261,7 +261,7 @@ | $44 dtag - L_SCR3 | | The cu savepc is set to zero, and the frame is restored to the -| fpu. +| FPU. | op0_xu: movel STAG(%a6),L_SCR1(%a6) @@ -384,7 +384,7 @@ | etemp - FP_SCR2 | | The cu savepc is set to zero, and the frame is restored to the -| fpu. +| FPU. | op2_xu: movel STAG(%a6),L_SCR1(%a6) diff -ur linux/arch/m68k/fpsp040/kernel_ex.S linux-2.1.106-local/arch/m68k/fpsp040/kernel_ex.S --- linux/arch/m68k/fpsp040/kernel_ex.S Tue Apr 23 21:31:24 1996 +++ linux-2.1.106-local/arch/m68k/fpsp040/kernel_ex.S Wed Jun 17 21:02:48 1998 @@ -2,7 +2,7 @@ | kernel_ex.sa 3.3 12/19/90 | | This file contains routines to force exception status in the -| fpu for exceptional cases detected or reported within the +| FPU for exceptional cases detected or reported within the | transcendental functions. Typically, the t_xx routine will | set the appropriate bits in the USER_FPSR word on the stack. | The bits are tested in gen_except.sa to determine if an exceptional diff -ur linux/arch/m68k/fpsp040/res_func.S linux-2.1.106-local/arch/m68k/fpsp040/res_func.S --- linux/arch/m68k/fpsp040/res_func.S Wed May 20 18:54:35 1998 +++ linux-2.1.106-local/arch/m68k/fpsp040/res_func.S Wed Jun 17 21:02:48 1998 @@ -630,7 +630,7 @@ | For fadd: | if(sign_of(dest) != sign_of(src)) | replace exponent of src with $3fff (keep sign) -| use fpu to perform dest+new_src (user's rmode and X) +| use FPU to perform dest+new_src (user's rmode and X) | clr sticky | else | set sticky @@ -640,7 +640,7 @@ | For fsub: | if(sign_of(dest) == sign_of(src)) | replace exponent of src with $3fff (keep sign) -| use fpu to perform dest+new_src (user's rmode and X) +| use FPU to perform dest+new_src (user's rmode and X) | clr sticky | else | set sticky @@ -693,7 +693,7 @@ | wrap_div: cmpb #0xff,DNRM_FLG(%a6) |if both ops denorm, - beq fix_stk |restore to fpu + beq fix_stk |restore to FPU | | One of the ops is denormalized. Test for wrap condition | and force the result. @@ -797,7 +797,7 @@ | wrap_add: cmpb #0xff,DNRM_FLG(%a6) |if both ops denorm, - beq fix_stk |restore to fpu + beq fix_stk |restore to FPU | | One of the ops is denormalized. Test for wrap condition | and complete the instruction. @@ -822,7 +822,7 @@ cmpl #0x8000,%d0 blt fix_stk |if less, not wrap case | -| Check the signs of the operands. If they are unlike, the fpu +| Check the signs of the operands. If they are unlike, the FPU | can be used to add the norm and 1.0 with the sign of the | denorm and it will correctly generate the result in extended | precision. We can then call round with no sticky and the result @@ -972,7 +972,7 @@ | wrap_sub: cmpb #0xff,DNRM_FLG(%a6) |if both ops denorm, - beq fix_stk |restore to fpu + beq fix_stk |restore to FPU | | One of the ops is denormalized. Test for wrap condition | and complete the instruction. @@ -997,7 +997,7 @@ cmpl #0x8000,%d0 blt fix_stk |if less, not wrap case | -| Check the signs of the operands. If they are alike, the fpu +| Check the signs of the operands. If they are alike, the FPU | can be used to subtract from the norm 1.0 with the sign of the | denorm and it will correctly generate the result in extended | precision. We can then call round with no sticky and the result @@ -1153,7 +1153,7 @@ | wrap_cmp: cmpb #0xff,DNRM_FLG(%a6) |if both ops denorm, - beq fix_stk |restore to fpu + beq fix_stk |restore to FPU | | One of the ops is denormalized. Test for wrap condition | and complete the instruction. diff -ur linux/arch/m68k/fpsp040/scale.S linux-2.1.106-local/arch/m68k/fpsp040/scale.S --- linux/arch/m68k/fpsp040/scale.S Fri Apr 26 02:12:35 1996 +++ linux-2.1.106-local/arch/m68k/fpsp040/scale.S Wed Jun 17 21:02:49 1998 @@ -187,7 +187,7 @@ | ;set unfl, aunfl, ainex | | Test for zero. If zero, simply use fmove to return +/- zero -| to the fpu. +| to the FPU. | tst_zero: clrw FPTEMP_EX(%a6) diff -ur linux/arch/m68k/fpsp040/skeleton.S linux-2.1.106-local/arch/m68k/fpsp040/skeleton.S --- linux/arch/m68k/fpsp040/skeleton.S Mon Jun 16 16:35:53 1997 +++ linux-2.1.106-local/arch/m68k/fpsp040/skeleton.S Wed Jun 17 21:02:49 1998 @@ -345,7 +345,7 @@ | | fpsp_fmt_error --- exit point for frame format error | -| The fpu stack frame does not match the frames existing +| The FPU stack frame does not match the frames existing | or planned at the time of this writing. The fpsp is | unable to handle frame sizes not in the following | version:size pairs: @@ -356,7 +356,7 @@ | | This entry point simply holds an f-line illegal value. | Replace this with a call to your kernel panic code or -| code to handle future revisions of the fpu. +| code to handle future revisions of the FPU. | .global fpsp_fmt_error fpsp_fmt_error: diff -ur linux/arch/m68k/fpsp040/x_operr.S linux-2.1.106-local/arch/m68k/fpsp040/x_operr.S --- linux/arch/m68k/fpsp040/x_operr.S Fri Apr 26 02:12:35 1996 +++ linux-2.1.106-local/arch/m68k/fpsp040/x_operr.S Wed Jun 17 21:02:49 1998 @@ -93,7 +93,7 @@ | The size is not B,W,or L, so the operr is handled by the | kernel handler. Set the operr bits and clean up, leaving | only the integer exception frame on the stack, and the -| fpu in the original exceptional state. +| FPU in the original exceptional state. | operr_end: bsetb #operr_bit,FPSR_EXCEPT(%a6) @@ -303,7 +303,7 @@ | End_operr tests for operr enabled. If not, it cleans up the stack | and does an rte. If enabled, it cleans up the stack and branches | to the kernel operr handler with only the integer exception -| frame on the stack and the fpu in the original exceptional state +| frame on the stack and the FPU in the original exceptional state | with correct data written to the destination. | end_operr: @@ -344,7 +344,7 @@ bral real_inex | | Since operr is only an E1 exception, there is no need to frestore -| any state back to the fpu. +| any state back to the FPU. | operr_exit: moveml USER_DA(%a6),%d0-%d1/%a0-%a1 diff -ur linux/arch/m68k/fpsp040/x_unfl.S linux-2.1.106-local/arch/m68k/fpsp040/x_unfl.S --- linux/arch/m68k/fpsp040/x_unfl.S Fri Apr 26 02:12:35 1996 +++ linux-2.1.106-local/arch/m68k/fpsp040/x_unfl.S Wed Jun 17 21:02:49 1998 @@ -150,7 +150,7 @@ | | | If the exception bit set is E3, the exceptional operand from the -| fpu is in WBTEMP; else it is in FPTEMP. +| FPU is in WBTEMP; else it is in FPTEMP. | btstb #E3,E_BYTE(%a6) beqs unf_E1 diff -ur linux/arch/m68k/ifpsp060/fpsp.doc linux-2.1.106-local/arch/m68k/ifpsp060/fpsp.doc --- linux/arch/m68k/ifpsp060/fpsp.doc Fri Apr 26 02:12:35 1996 +++ linux-2.1.106-local/arch/m68k/ifpsp060/fpsp.doc Wed Jun 17 21:02:49 1998 @@ -231,7 +231,7 @@ ------------------------------------------- | | | v v v - (unimplemented (fpu disabled) (possible F-line illegal) + (unimplemented (FPU disabled) (possible F-line illegal) stack frame) | v | v special case "fmovecr"? | exit through | @@ -240,7 +240,7 @@ | ^ v v | | (yes) (no) | | v v - | | fpu disabled? exit through + | | FPU disabled? exit through | | | _060_real_fline v | ------------- | | | | diff -ur linux/arch/m68k/ifpsp060/fskeleton.S linux-2.1.106-local/arch/m68k/ifpsp060/fskeleton.S --- linux/arch/m68k/ifpsp060/fskeleton.S Wed Sep 25 00:47:39 1996 +++ linux-2.1.106-local/arch/m68k/ifpsp060/fskeleton.S Wed Jun 17 21:02:50 1998 @@ -230,7 +230,7 @@ | .global _060_real_fpu_disabled _060_real_fpu_disabled: - move.l %d0,-(%sp) | enabled the fpu + move.l %d0,-(%sp) | enabled the FPU .long 0x4E7A0808 |movec pcr,%d0 bclr #0x1,%d0 .long 0x4E7B0808 |movec %d0,pcr diff -ur linux/arch/m68k/kernel/entry.S linux-2.1.106-local/arch/m68k/kernel/entry.S --- linux/arch/m68k/kernel/entry.S Sat Jun 13 13:14:32 1998 +++ linux-2.1.106-local/arch/m68k/kernel/entry.S Wed Jun 17 21:02:50 1998 @@ -25,7 +25,7 @@ */ /* - * 12/03/96 Jes: Currently we only support m68k single-cpu systems, so + * 12/03/96 Jes: Currently we only support m68k single-CPU systems, so * all pointers that used to be 'current' are now entry * number 0 in the 'current_set' list. */ diff -ur linux/arch/m68k/kernel/head.S linux-2.1.106-local/arch/m68k/kernel/head.S --- linux/arch/m68k/kernel/head.S Sat Jun 13 13:14:32 1998 +++ linux-2.1.106-local/arch/m68k/kernel/head.S Wed Jun 17 21:02:50 1998 @@ -62,7 +62,7 @@ * cache status can be changed (used for '0[46]0) * you must increase a2 if alloc a new page * d7 - used for debug output and some macros - * d6 - cpu type and cache mode + * d6 - CPU type and cache mode * d5 - physical start address of kernel * d4 - machine type */ diff -ur linux/arch/m68k/kernel/process.c linux-2.1.106-local/arch/m68k/kernel/process.c --- linux/arch/m68k/kernel/process.c Fri May 8 00:15:21 1998 +++ linux-2.1.106-local/arch/m68k/kernel/process.c Wed Jun 17 21:02:50 1998 @@ -187,7 +187,7 @@ */ p->tss.fs = get_fs().seg; - /* Copy the current fpu state */ + /* Copy the current FPU state */ asm volatile ("fsave %0" : : "m" (p->tss.fpstate[0]) : "memory"); if (!CPU_IS_060 ? p->tss.fpstate[0] : p->tss.fpstate[2]) @@ -195,19 +195,19 @@ "fmoveml %/fpiar/%/fpcr/%/fpsr,%1" : : "m" (p->tss.fp[0]), "m" (p->tss.fpcntl[0]) : "memory"); - /* Restore the state in case the fpu was busy */ + /* Restore the state in case the FPU was busy */ asm volatile ("frestore %0" : : "m" (p->tss.fpstate[0])); return 0; } -/* Fill in the fpu structure for a core dump. */ +/* Fill in the FPU structure for a core dump. */ int dump_fpu (struct pt_regs *regs, struct user_m68kfp_struct *fpu) { char fpustate[216]; - /* First dump the fpu context to avoid protocol violation. */ + /* First dump the FPU context to avoid protocol violation. */ asm volatile ("fsave %0" :: "m" (fpustate[0]) : "memory"); if (!CPU_IS_060 ? !fpustate[0] : !fpustate[2]) return 0; diff -ur linux/arch/m68k/kernel/setup.c linux-2.1.106-local/arch/m68k/kernel/setup.c --- linux/arch/m68k/kernel/setup.c Sat Jun 13 13:14:32 1998 +++ linux-2.1.106-local/arch/m68k/kernel/setup.c Wed Jun 17 21:02:51 1998 @@ -174,7 +174,7 @@ base_trap_init(); - /* clear the fpu if we have one */ + /* clear the FPU if we have one */ if (m68k_fputype & (FPU_68881|FPU_68882|FPU_68040|FPU_68060)) { volatile int zero = 0; asm __volatile__ ("frestore %0" : : "m" (zero)); diff -ur linux/arch/m68k/kernel/signal.c linux-2.1.106-local/arch/m68k/kernel/signal.c --- linux/arch/m68k/kernel/signal.c Sat Jun 13 13:14:32 1998 +++ linux-2.1.106-local/arch/m68k/kernel/signal.c Wed Jun 17 21:02:51 1998 @@ -175,7 +175,7 @@ }; -static unsigned char fpu_version = 0; /* version number of fpu, set by setup_frame */ +static unsigned char fpu_version = 0; /* version number of FPU, set by setup_frame */ static inline void restore_fpu_state(struct sigcontext *sc) { @@ -350,7 +350,7 @@ : "a0"); #undef frame_offset /* - * If we ever get here an exception occured while + * If we ever get here an exception occurred while * building the above stack-frame. */ goto badframe; @@ -443,7 +443,7 @@ : "a0"); #undef frame_offset /* - * If we ever get here an exception occured while + * If we ever get here an exception occurred while * building the above stack-frame. */ goto badframe; diff -ur linux/arch/m68k/kernel/sys_m68k.c linux-2.1.106-local/arch/m68k/kernel/sys_m68k.c --- linux/arch/m68k/kernel/sys_m68k.c Sat Jun 13 13:14:32 1998 +++ linux-2.1.106-local/arch/m68k/kernel/sys_m68k.c Wed Jun 17 21:02:51 1998 @@ -27,7 +27,7 @@ /* * sys_pipe() is the normal C calling standard for creating - * a pipe. It's not the way unix traditionally does this, though. + * a pipe. It's not the way Unix traditionally does this, though. */ asmlinkage int sys_pipe(unsigned long * fildes) { diff -ur linux/arch/m68k/kernel/time.c linux-2.1.106-local/arch/m68k/kernel/time.c --- linux/arch/m68k/kernel/time.c Wed May 20 18:54:35 1998 +++ linux-2.1.106-local/arch/m68k/kernel/time.c Wed Jun 17 21:02:52 1998 @@ -52,7 +52,7 @@ */ static void timer_interrupt(int irq, void *dummy, struct pt_regs * regs) { - /* last time the cmos clock got updated */ + /* last time the CMOS clock got updated */ static long last_rtc_update=0; do_timer(regs); diff -ur linux/arch/m68k/lib/checksum.c linux-2.1.106-local/arch/m68k/lib/checksum.c --- linux/arch/m68k/lib/checksum.c Wed Apr 23 19:01:15 1997 +++ linux-2.1.106-local/arch/m68k/lib/checksum.c Wed Jun 17 21:02:52 1998 @@ -39,7 +39,7 @@ { unsigned long tmp1, tmp2; /* - * Experiments with ethernet and slip connections show that buff + * Experiments with Ethernet and SLIP connections show that buff * is aligned on either a 2-byte or 4-byte boundary. */ __asm__("movel %2,%3\n\t" diff -ur linux/arch/m68k/mac/adb-bus.c linux-2.1.106-local/arch/m68k/mac/adb-bus.c --- linux/arch/m68k/mac/adb-bus.c Sat Jun 13 13:14:33 1998 +++ linux-2.1.106-local/arch/m68k/mac/adb-bus.c Wed Jun 17 21:02:53 1998 @@ -192,8 +192,8 @@ via_write(via1, vIFR, SR_INT); /* - * Ok we probably ;) have a ready to use adb bus. Its also - * hopefully idle (Im assuming the mac didnt leave a half + * OK we probably ;) have a ready to use ADB bus. It's also + * --I hope--idle (I'm assuming the Mac didn't leave a half * complete transaction on booting us). */ @@ -202,7 +202,7 @@ adb_state = idle; break; /* - * Unsupported; but later code doesn't notice !! + * Unsupported, but later code doesn't notice! */ case MAC_ADB_CUDA: printk("adb: CUDA interface.\n"); diff -ur linux/arch/m68k/mac/config.c linux-2.1.106-local/arch/m68k/mac/config.c --- linux/arch/m68k/mac/config.c Sat Jun 13 13:14:33 1998 +++ linux-2.1.106-local/arch/m68k/mac/config.c Wed Jun 17 21:02:53 1998 @@ -375,7 +375,7 @@ /* * Quadra (only 68030 ones will actually work!). Not much odd. Video is at * 0xF9000000, via is like a MacII. We label it differently as some of the - * stuff connected to VIA2 seems different. Better SCSI chip and ???? onboard ethernet + * stuff connected to VIA2 seems different. Better SCSI chip and (?) onboard Ethernet * in all cases using a NatSemi SONIC. The 700, 900 and 950 have some I/O chips in the wrong * place to confuse us. The 840 seems to have a scsi location of its own */ @@ -387,7 +387,7 @@ /* The Q700 does have a NS Sonic */ { MAC_MODEL_Q700, "Quadra 700", MAC_ADB_II, MAC_VIA_QUADRA, MAC_SCSI_QUADRA2, MAC_IDE_NONE, MAC_SCC_QUADRA2, MAC_ETHER_SONIC, MAC_NUBUS}, { MAC_MODEL_Q800, "Quadra 800", MAC_ADB_II, MAC_VIA_QUADRA, MAC_SCSI_QUADRA, MAC_IDE_NONE, MAC_SCC_QUADRA, MAC_ETHER_SONIC, MAC_NUBUS}, - /* Does the 840 have ethernet ??? documents seem to indicate its not quite a + /* Does the 840 have Ethernet? Documents seem to indicate it's not quite a Quadra in this respect ? */ { MAC_MODEL_Q840, "Quadra 840", MAC_ADB_CUDA, MAC_VIA_QUADRA, MAC_SCSI_QUADRA3, MAC_IDE_NONE, MAC_SCC_II, MAC_ETHER_NONE, MAC_NUBUS}, /* These might have IOP problems */ diff -ur linux/arch/m68k/mac/macints.c linux-2.1.106-local/arch/m68k/mac/macints.c --- linux/arch/m68k/mac/macints.c Sat Jun 13 13:14:33 1998 +++ linux-2.1.106-local/arch/m68k/mac/macints.c Wed Jun 17 21:02:54 1998 @@ -30,7 +30,7 @@ * * AV Macs only, handled by PSC: * - * 3 - MACE ethernet IRQ (DMA complete on level 4) + * 3 - MACE Ethernet IRQ (DMA complete on level 4) * * 5 - DSP ?? * diff -ur linux/arch/m68k/mm/kmap.c linux-2.1.106-local/arch/m68k/mm/kmap.c --- linux/arch/m68k/mm/kmap.c Thu Feb 12 16:30:13 1998 +++ linux-2.1.106-local/arch/m68k/mm/kmap.c Wed Jun 17 21:02:54 1998 @@ -356,7 +356,7 @@ /* * This not only unmaps the requested region, but also loops over the whole - * pmd to determine whether the other pte's are clear (so that the page can be + * pmd to determine whether the other PTEs are clear (so that the page can be * freed.) If so, it returns 1, 0 otherwise. */ static inline int diff -ur ./linux/include/asm-m68k/bootinfo.h ./linux-2.1.106-local/include/asm-m68k/bootinfo.h --- ./linux/include/asm-m68k/bootinfo.h Sat Jun 13 13:14:33 1998 +++ ./linux-2.1.106-local/include/asm-m68k/bootinfo.h Wed Jun 17 21:07:37 1998 @@ -64,9 +64,9 @@ #define BI_LAST 0x0000 /* last record (sentinel) */ #define BI_MACHTYPE 0x0001 /* machine type (u_long) */ -#define BI_CPUTYPE 0x0002 /* cpu type (u_long) */ -#define BI_FPUTYPE 0x0003 /* fpu type (u_long) */ -#define BI_MMUTYPE 0x0004 /* mmu type (u_long) */ +#define BI_CPUTYPE 0x0002 /* CPU type (u_long) */ +#define BI_FPUTYPE 0x0003 /* FPU type (u_long) */ +#define BI_MMUTYPE 0x0004 /* MMU type (u_long) */ #define BI_MEMCHUNK 0x0005 /* memory chunk address and size */ /* (struct mem_info) */ #define BI_RAMDISK 0x0006 /* ramdisk address and size */ @@ -143,8 +143,8 @@ #define BI_MAC_NUBUS 0x801a /* Mac Nubus type (none, regular, pseudo) */ #define BI_MAC_SLOTMASK 0x801b /* Mac Nubus slots present */ #define BI_MAC_SCCTYPE 0x801c /* Mac SCC serial type (normal, IOP) */ -#define BI_MAC_ETHTYPE 0x801d /* Mac builtin ethernet type (Sonic, MACE */ -#define BI_MAC_ETHBASE 0x801e /* Mac builtin ethernet base address */ +#define BI_MAC_ETHTYPE 0x801d /* Mac builtin Ethernet type (Sonic, MACE */ +#define BI_MAC_ETHBASE 0x801e /* Mac builtin Ethernet base address */ #define BI_MAC_PMU 0x801f /* Mac power managment / poweroff hardware */ #define BI_MAC_IOP_SWIM 0x8020 /* Mac SWIM floppy IOP */ #define BI_MAC_IOP_ADB 0x8021 /* Mac ADB IOP */ diff -ur ./linux/include/asm-m68k/elf.h ./linux-2.1.106-local/include/asm-m68k/elf.h --- ./linux/include/asm-m68k/elf.h Fri Feb 6 10:06:56 1998 +++ ./linux-2.1.106-local/include/asm-m68k/elf.h Wed Jun 17 21:07:37 1998 @@ -69,7 +69,7 @@ } /* This yields a mask that user programs can use to figure out what - instruction set this cpu supports. */ + instruction set this CPU supports. */ #define ELF_HWCAP (0) diff -ur ./linux/include/asm-m68k/linux_logo.h ./linux-2.1.106-local/include/asm-m68k/linux_logo.h --- ./linux/include/asm-m68k/linux_logo.h Fri May 8 00:15:22 1998 +++ ./linux-2.1.106-local/include/asm-m68k/linux_logo.h Wed Jun 17 21:07:37 1998 @@ -14,7 +14,7 @@ * linux_logo_blue[0]) is color 0x20) * BW image has to be 80x80 as well, with MS bit * on the left - * Serial_console ascii image can be any size, + * Serial_console ASCII image can be any size, * but should contain %s to display the version */ diff -ur ./linux/include/asm-m68k/pgtable.h ./linux-2.1.106-local/include/asm-m68k/pgtable.h --- ./linux/include/asm-m68k/pgtable.h Sat Jun 13 13:14:33 1998 +++ ./linux-2.1.106-local/include/asm-m68k/pgtable.h Wed Jun 17 21:07:38 1998 @@ -238,7 +238,7 @@ __asm__ __volatile__("pflush #4,#4,(%0)" : : "a" (addr)); } -/* Certain architectures need to do special things when pte's +/* Certain architectures need to do special things when PTEs * within a page table are directly modified. Thus, the following * hook is made available. */ diff -ur ./linux/include/asm-m68k/processor.h ./linux-2.1.106-local/include/asm-m68k/processor.h --- ./linux/include/asm-m68k/processor.h Sat Jun 13 13:14:33 1998 +++ ./linux-2.1.106-local/include/asm-m68k/processor.h Wed Jun 17 21:07:38 1998 @@ -38,7 +38,7 @@ unsigned long usp; /* user stack pointer */ unsigned short sr; /* saved status register */ unsigned short fs; /* saved fs (sfc, dfc) */ - unsigned long crp[2]; /* cpu root pointer */ + unsigned long crp[2]; /* CPU root pointer */ unsigned long esp0; /* points to SR of stack frame */ unsigned long fp[8*3]; unsigned long fpcntl[3]; /* fp control regs */ ___ Trevor Johnson ------- end of forwarded message -------