Subject: + hfsplus-fix-compiler-warning-on-powerpc.patch added to -mm tree To: lists@xxxxxxxxxxxxxxx,geert@xxxxxxxxxxxxxx,saproj@xxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Thu, 29 May 2014 15:02:05 -0700 The patch titled Subject: hfsplus: fix compiler warning on PowerPC has been added to the -mm tree. Its filename is hfsplus-fix-compiler-warning-on-powerpc.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/hfsplus-fix-compiler-warning-on-powerpc.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/hfsplus-fix-compiler-warning-on-powerpc.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Christian Kujau <lists@xxxxxxxxxxxxxxx> Subject: hfsplus: fix compiler warning on PowerPC a99b7069aab8 ("hfsplus: Fix undefined __divdi3 in hfsplus_init_header_node()") introduced do_div() to xattr.c and the warning below too. As Geert remarked: "tmp" is "loff_t" which is "__kernel_loff_t", which is "long long", i.e. signed, while include/asm-generic/div64.h compares its type with "uint64_t". As inode sizes are positive, it should be safe to change the type of "tmp" to "u64". ============================== CC [M] fs/hfsplus/xattr_user.o CC [M] fs/hfsplus/xattr_security.o CC [M] fs/hfsplus/xattr.o CC [M] fs/hfsplus/xattr_trusted.o In file included from arch/powerpc/include/asm/div64.h:1:0, from include/linux/kernel.h:124, from include/asm-generic/bug.h:13, from arch/powerpc/include/asm/bug.h:127, from include/linux/bug.h:4, from include/linux/thread_info.h:11, from include/asm-generic/preempt.h:4, from arch/powerpc/include/generated/asm/preempt.h:1, from include/linux/preempt.h:18, from include/linux/spinlock.h:50, from include/linux/wait.h:8, from include/linux/fs.h:6, from fs/hfsplus/hfsplus_fs.h:19, from fs/hfsplus/xattr.c:9: fs/hfsplus/xattr.c: In function 'hfsplus_init_header_node': include/asm-generic/div64.h:43:28: warning: comparison of distinct pointer types lacks a cast [enabled by default] (void)(((typeof((n)) *)0) == ((uint64_t *)0)); \ ^ fs/hfsplus/xattr.c:86:2: note: in expansion of macro 'do_div' do_div(tmp, node_size); ^ LD [M] fs/hfsplus/hfsplus.o ============================== Signed-off-by: Christian Kujau <lists@xxxxxxxxxxxxxxx> Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx> Acked-by: Sergei Antonov <saproj@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/hfsplus/xattr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN fs/hfsplus/xattr.c~hfsplus-fix-compiler-warning-on-powerpc fs/hfsplus/xattr.c --- a/fs/hfsplus/xattr.c~hfsplus-fix-compiler-warning-on-powerpc +++ a/fs/hfsplus/xattr.c @@ -67,7 +67,7 @@ static void hfsplus_init_header_node(str char *bmp; u32 used_nodes; u32 used_bmp_bytes; - loff_t tmp; + u64 tmp; hfs_dbg(ATTR_MOD, "init_hdr_attr_file: clump %u, node_size %u\n", clump_size, node_size); _ Patches currently in -mm which might be from lists@xxxxxxxxxxxxxxx are hfsplus-fix-compiler-warning-on-powerpc.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html