2020-07-22 23:53:18

by Finn Thain

[permalink] [raw]
Subject: [PATCH] m68k: Correct some typos in comments

Signed-off-by: Finn Thain <[email protected]>
---
arch/m68k/kernel/head.S | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/arch/m68k/kernel/head.S b/arch/m68k/kernel/head.S
index a54788458ca36..08eff92875144 100644
--- a/arch/m68k/kernel/head.S
+++ b/arch/m68k/kernel/head.S
@@ -57,7 +57,7 @@
* Of course, readability is a subjective issue, so it will never be
* argued that that goal was accomplished. It was merely a goal.
* A key way to help make code more readable is to give good
- * documentation. So, the first thing you will find is exaustive
+ * documentation. So, the first thing you will find is exhaustive
* write-ups on the structure of the file, and the features of the
* functional subroutines.
*
@@ -1304,7 +1304,7 @@ L(mmu_fixup_done):
* mmu_engage
*
* This chunk of code performs the gruesome task of engaging the MMU.
- * The reason its gruesome is because when the MMU becomes engaged it
+ * The reason it's gruesome is because when the MMU becomes engaged it
* maps logical addresses to physical addresses. The Program Counter
* register is then passed through the MMU before the next instruction
* is fetched (the instruction following the engage MMU instruction).
@@ -1369,7 +1369,7 @@ L(mmu_fixup_done):
/*
* After this point no new memory is allocated and
* the start of available memory is stored in availmem.
- * (The bootmem allocator requires now the physicall address.)
+ * (The bootmem allocator requires now the physical address.)
*/

movel L(memory_start),availmem
@@ -1547,7 +1547,7 @@ func_return get_bi_record
* seven bits of the logical address (LA) are used as an
* index into the "root table." Each entry in the root
* table has a bit which specifies if it's a valid pointer to a
- * pointer table. Each entry defines a 32KMeg range of memory.
+ * pointer table. Each entry defines a 32Meg range of memory.
* If an entry is invalid then that logical range of 32M is
* invalid and references to that range of memory (when the MMU
* is enabled) will fault. If the entry is valid, then it does
@@ -1584,7 +1584,7 @@ func_return get_bi_record
* bits 17..12 - index into the Page Table
* bits 11..0 - offset into a particular 4K page
*
- * The algorithms which follows do one thing: they abstract
+ * The algorithms which follow do one thing: they abstract
* the MMU hardware. For example, there are three kinds of
* cache settings that are relevant. Either, memory is
* being mapped in which case it is either Kernel Code (or
@@ -2082,7 +2082,7 @@ func_return mmu_map_tt
* mmu_map
*
* This routine will map a range of memory using a pointer
- * table and allocating the pages on the fly from the kernel.
+ * table and allocate the pages on the fly from the kernel.
* The pointer table does not have to be already linked into
* the root table, this routine will do that if necessary.
*
@@ -2528,7 +2528,7 @@ func_start mmu_get_root_table_entry,%d0/%a1

/* Find the start of free memory, get_bi_record does this for us,
* as the bootinfo structure is located directly behind the kernel
- * and and we simply search for the last entry.
+ * we simply search for the last entry.
*/
get_bi_record BI_LAST
addw #PAGESIZE-1,%a0
@@ -2654,7 +2654,7 @@ func_start mmu_get_page_table_entry,%d0/%a1
jne 2f

/* If the page table entry doesn't exist, we allocate a complete new
- * page and use it as one continues big page table which can cover
+ * page and use it as one continuous big page table which can cover
* 4MB of memory, nearly almost all mappings have that alignment.
*/
get_new_page
--
2.26.2


2020-08-26 08:56:54

by Geert Uytterhoeven

[permalink] [raw]
Subject: Re: [PATCH] m68k: Correct some typos in comments

Hi Finn,

On Thu, Jul 23, 2020 at 1:50 AM Finn Thain <[email protected]> wrote:
> Signed-off-by: Finn Thain <[email protected]>

Thanks for your patch!

> --- a/arch/m68k/kernel/head.S
> +++ b/arch/m68k/kernel/head.S

> @@ -1547,7 +1547,7 @@ func_return get_bi_record
> * seven bits of the logical address (LA) are used as an
> * index into the "root table." Each entry in the root
> * table has a bit which specifies if it's a valid pointer to a
> - * pointer table. Each entry defines a 32KMeg range of memory.
> + * pointer table. Each entry defines a 32Meg range of memory.
> * If an entry is invalid then that logical range of 32M is

Ah, lots of opportunities to switch to SI prefixes (MiB) ;-)

> * invalid and references to that range of memory (when the MMU
> * is enabled) will fault. If the entry is valid, then it does

> @@ -2654,7 +2654,7 @@ func_start mmu_get_page_table_entry,%d0/%a1
> jne 2f
>
> /* If the page table entry doesn't exist, we allocate a complete new
> - * page and use it as one continues big page table which can cover
> + * page and use it as one continuous big page table which can cover

Usually I use "contiguous", but the dictionary seems to permit both.

> * 4MB of memory, nearly almost all mappings have that alignment.
> */
> get_new_page

Reviewed-by: Geert Uytterhoeven <[email protected]>
i.e. will queue in the m68k for-v5.10 branch.

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

2020-08-27 04:01:33

by Finn Thain

[permalink] [raw]
Subject: Re: [PATCH] m68k: Correct some typos in comments

On Wed, 26 Aug 2020, Geert Uytterhoeven wrote:

> > @@ -2654,7 +2654,7 @@ func_start mmu_get_page_table_entry,%d0/%a1
> > jne 2f
> >
> > /* If the page table entry doesn't exist, we allocate a complete new
> > - * page and use it as one continues big page table which can cover
> > + * page and use it as one continuous big page table which can cover
>
> Usually I use "contiguous", but the dictionary seems to permit both.
>

Two or more things may be said to be "contiguous". I think this sentence
refers to only one thing.

> > * 4MB of memory, nearly almost all mappings have that alignment.
> > */
> > get_new_page
>
> Reviewed-by: Geert Uytterhoeven <[email protected]>
> i.e. will queue in the m68k for-v5.10 branch.
>

Thanks.

> Gr{oetje,eeting}s,
>
> Geert
>