Signed-off-by: Geert Uytterhoeven <[email protected]>
Cc: Benjamin Herrenschmidt <[email protected]>
Cc: [email protected]
---
arch/powerpc/boot/simpleboot.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/powerpc/boot/simpleboot.c b/arch/powerpc/boot/simpleboot.c
index 21cd48074ec8..9f8c678f0d9a 100644
--- a/arch/powerpc/boot/simpleboot.c
+++ b/arch/powerpc/boot/simpleboot.c
@@ -61,7 +61,7 @@ void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
if (*reg++ != 0)
fatal("Memory range is not based at address 0\n");
- /* get the memsize and trucate it to under 4G on 32 bit machines */
+ /* get the memsize and truncate it to under 4G on 32 bit machines */
memsize64 = 0;
for (i = 0; i < *ns; i++)
memsize64 = (memsize64 << 32) | *reg++;
--
1.9.1
Signed-off-by: Geert Uytterhoeven <[email protected]>
Cc: Brian Norris <[email protected]>
Cc: [email protected]
---
drivers/mtd/cmdlinepart.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mtd/cmdlinepart.c b/drivers/mtd/cmdlinepart.c
index 3e829b37af8d..c8503006f17a 100644
--- a/drivers/mtd/cmdlinepart.c
+++ b/drivers/mtd/cmdlinepart.c
@@ -26,7 +26,7 @@
* <mtd-id> := unique name used in mapping driver/device (mtd->name)
* <size> := standard linux memsize OR "-" to denote all remaining space
* size is automatically truncated at end of device
- * if specified or trucated size is 0 the part is skipped
+ * if specified or truncated size is 0 the part is skipped
* <offset> := standard linux memsize
* if omitted the part will immediately follow the previous part
* or 0 if the first part
--
1.9.1
Signed-off-by: Geert Uytterhoeven <[email protected]>
Cc: Steven Whitehouse <[email protected]>
Cc: [email protected]
---
fs/gfs2/glops.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c
index fc1100781bbc..2ffc67dce87f 100644
--- a/fs/gfs2/glops.c
+++ b/fs/gfs2/glops.c
@@ -234,8 +234,8 @@ static void inode_go_sync(struct gfs2_glock *gl)
* inode_go_inval - prepare a inode glock to be released
* @gl: the glock
* @flags:
- *
- * Normally we invlidate everything, but if we are moving into
+ *
+ * Normally we invalidate everything, but if we are moving into
* LM_ST_DEFERRED from LM_ST_SHARED or LM_ST_EXCLUSIVE then we
* can keep hold of the metadata, since it won't have changed.
*
--
1.9.1
Signed-off-by: Geert Uytterhoeven <[email protected]>
Cc: Johannes Weiner <[email protected]>
Cc: [email protected]
---
mm/memcontrol.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index a2c7bcb0e6eb..2c010573668e 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -4034,7 +4034,7 @@ void mem_cgroup_uncharge_cache_page(struct page *page)
}
/*
- * Batch_start/batch_end is called in unmap_page_range/invlidate/trucate.
+ * Batch_start/batch_end is called in unmap_page_range/invalidate/truncate.
* In that cases, pages are freed continuously and we can expect pages
* are in the same memcg. All these calls itself limits the number of
* pages freed at once, then uncharge_start/end() is called properly.
--
1.9.1
----- Original Message -----
> Signed-off-by: Geert Uytterhoeven <[email protected]>
> Cc: Steven Whitehouse <[email protected]>
> Cc: [email protected]
> ---
> fs/gfs2/glops.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c
> index fc1100781bbc..2ffc67dce87f 100644
> --- a/fs/gfs2/glops.c
> +++ b/fs/gfs2/glops.c
> @@ -234,8 +234,8 @@ static void inode_go_sync(struct gfs2_glock *gl)
> * inode_go_inval - prepare a inode glock to be released
> * @gl: the glock
> * @flags:
> - *
> - * Normally we invlidate everything, but if we are moving into
> + *
> + * Normally we invalidate everything, but if we are moving into
> * LM_ST_DEFERRED from LM_ST_SHARED or LM_ST_EXCLUSIVE then we
> * can keep hold of the metadata, since it won't have changed.
> *
> --
> 1.9.1
Hi Geert,
ACK,
Steve is on holiday this week, but he will likely add it to the GFS2 nmw
git repo when he returns.
Regards,
Bob Peterson
Red Hat File Systems
On Sun, Jun 29, 2014 at 12:21:37PM +0200, Geert Uytterhoeven wrote:
> Signed-off-by: Geert Uytterhoeven <[email protected]>
> Cc: Brian Norris <[email protected]>
> Cc: [email protected]
Pushed to l2-mtd.git. Thanks!
Brian
Hi,
Now in the -nmw tree. Thanks,
Steve.
On 29/06/14 11:21, Geert Uytterhoeven wrote:
> Signed-off-by: Geert Uytterhoeven <[email protected]>
> Cc: Steven Whitehouse <[email protected]>
> Cc: [email protected]
> ---
> fs/gfs2/glops.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c
> index fc1100781bbc..2ffc67dce87f 100644
> --- a/fs/gfs2/glops.c
> +++ b/fs/gfs2/glops.c
> @@ -234,8 +234,8 @@ static void inode_go_sync(struct gfs2_glock *gl)
> * inode_go_inval - prepare a inode glock to be released
> * @gl: the glock
> * @flags:
> - *
> - * Normally we invlidate everything, but if we are moving into
> + *
> + * Normally we invalidate everything, but if we are moving into
> * LM_ST_DEFERRED from LM_ST_SHARED or LM_ST_EXCLUSIVE then we
> * can keep hold of the metadata, since it won't have changed.
> *