From: Paolo 'Blaisorblade' Giarrusso Fix two harmless warnings in 64-bit compilation (the 2nd doesn't trigger for now because of a missing __attribute((format)) for cow_printf, but next patches fix that). Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton --- arch/um/drivers/cow_user.c | 3 ++- arch/um/drivers/mconsole_kern.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff -puN arch/um/drivers/cow_user.c~uml-fix-2-harmless-cast-warnings-for-64-bit arch/um/drivers/cow_user.c --- 25/arch/um/drivers/cow_user.c~uml-fix-2-harmless-cast-warnings-for-64-bit Fri Apr 7 15:22:30 2006 +++ 25-akpm/arch/um/drivers/cow_user.c Fri Apr 7 15:22:30 2006 @@ -210,8 +210,9 @@ int write_cow_header(char *cow_file, int err = -EINVAL; if(strlen(backing_file) > sizeof(header->backing_file) - 1){ + /* Below, %zd is for a size_t value */ cow_printf("Backing file name \"%s\" is too long - names are " - "limited to %d characters\n", backing_file, + "limited to %zd characters\n", backing_file, sizeof(header->backing_file) - 1); goto out_free; } diff -puN arch/um/drivers/mconsole_kern.c~uml-fix-2-harmless-cast-warnings-for-64-bit arch/um/drivers/mconsole_kern.c --- 25/arch/um/drivers/mconsole_kern.c~uml-fix-2-harmless-cast-warnings-for-64-bit Fri Apr 7 15:22:30 2006 +++ 25-akpm/arch/um/drivers/mconsole_kern.c Fri Apr 7 15:22:30 2006 @@ -615,7 +615,7 @@ static void console_write(struct console return; while(1){ - n = min((size_t)len, ARRAY_SIZE(console_buf) - console_index); + n = min((size_t) len, ARRAY_SIZE(console_buf) - console_index); strncpy(&console_buf[console_index], string, n); console_index += n; string += n; _