From patchwork Tue Apr 23 07:46:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 238776 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 1C3482C00F0 for ; Tue, 23 Apr 2013 17:47:11 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755474Ab3DWHqf (ORCPT ); Tue, 23 Apr 2013 03:46:35 -0400 Received: from haggis.pcug.org.au ([203.10.76.10]:59511 "EHLO members.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754482Ab3DWHqe (ORCPT ); Tue, 23 Apr 2013 03:46:34 -0400 Received: from canb.auug.org.au (ibmaus65.lnk.telstra.net [165.228.126.9]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by members.tip.net.au (Postfix) with ESMTPSA id 1377E1640F7; Tue, 23 Apr 2013 17:46:28 +1000 (EST) Date: Tue, 23 Apr 2013 17:46:18 +1000 From: Stephen Rothwell To: David Miller , Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Patrick McHardy Subject: linux-next: build failure after merge of the final tree (net-next tree related) Message-Id: <20130423174618.59095bd1cf999c61332d4805@canb.auug.org.au> X-Mailer: Sylpheed 3.3.0 (GTK+ 2.24.10; i486-pc-linux-gnu) Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 :-)). I added the following patch for today: From: Stephen Rothwell 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 --- net/netlink/af_netlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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++;