Message ID | 20130423174618.59095bd1cf999c61332d4805@canb.auug.org.au |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Tue, 23 Apr 2013 17:46:18 +1000 > After merging the final tree, today's linux-next build (powerpc > allyesconfig) failed like this: > > net/netlink/af_netlink.c: In function 'netlink_frame_flush_dcache': > net/netlink/af_netlink.c:384:40: error: 'NL_MMAP_MSG_HDRLEN' undeclared (first use in this function) > > Caused by commit 9652e931e73b ("netlink: add mmap'ed netlink helper > functions"). This needed to be build tested on an architecture that has > ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE set to 1 (like Sparc :-)). Sorry, my Sparcs are busy debugging other things at the moment :-) > > From: Stephen Rothwell <sfr@canb.auug.org.au> > Date: Tue, 23 Apr 2013 17:40:35 +1000 > Subject: [PATCH] netlink: fix typo in net/netlink/af_netlink.c > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Applied, thanks! -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, 23 Apr 2013, Stephen Rothwell wrote: > Hi all, > > After merging the final tree, today's linux-next build (powerpc > allyesconfig) failed like this: > > net/netlink/af_netlink.c: In function 'netlink_frame_flush_dcache': > net/netlink/af_netlink.c:384:40: error: 'NL_MMAP_MSG_HDRLEN' undeclared (first use in this function) > > Caused by commit 9652e931e73b ("netlink: add mmap'ed netlink helper > functions"). This needed to be build tested on an architecture that has > ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE set to 1 (like Sparc :-)). > Hijacking this thread since I didn't see the causing patch to be posted to lkml. From linux-next: net/netlink/af_netlink.c: In function 'netlink_queue_mmaped_skb': net/netlink/af_netlink.c:663:14: error: incompatible types when assigning to type '__u32' from type 'kuid_t' net/netlink/af_netlink.c:664:14: error: incompatible types when assigning to type '__u32' from type 'kgid_t' net/netlink/af_netlink.c: In function 'netlink_ring_set_copied': net/netlink/af_netlink.c:693:14: error: incompatible types when assigning to type '__u32' from type 'kuid_t' net/netlink/af_netlink.c:694:14: error: incompatible types when assigning to type '__u32' from type 'kgid_t' for a config with CONFIG_UIDGID_STRICT_TYPE_CHECKS enabled. Looks like it's coming from f9c2288837ba ("netlink: implement memory mapped recvmsg()"). Patrick? -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index 2a3e9ba..da5601d 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c @@ -381,7 +381,7 @@ static void netlink_frame_flush_dcache(const struct nl_mmap_hdr *hdr) /* First page is flushed through netlink_{get,set}_status */ p_start = pgvec_to_page(hdr + PAGE_SIZE); - p_end = pgvec_to_page((void *)hdr + NL_MMAP_MSG_HDRLEN + hdr->nm_len - 1); + p_end = pgvec_to_page((void *)hdr + NL_MMAP_HDRLEN + hdr->nm_len - 1); while (p_start <= p_end) { flush_dcache_page(p_start); p_start++;