From patchwork Thu Nov 18 04:03:19 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tetsuo Handa X-Patchwork-Id: 72044 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 9DF04B71A4 for ; Thu, 18 Nov 2010 15:04:41 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752460Ab0KREDX (ORCPT ); Wed, 17 Nov 2010 23:03:23 -0500 Received: from www262.sakura.ne.jp ([202.181.97.72]:53823 "EHLO www262.sakura.ne.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750698Ab0KREDX (ORCPT ); Wed, 17 Nov 2010 23:03:23 -0500 Received: from www262.sakura.ne.jp (ksav31.sakura.ne.jp [210.224.165.211]) by www262.sakura.ne.jp (8.14.3/8.14.3) with ESMTP id oAI43KTZ005081; Thu, 18 Nov 2010 13:03:20 +0900 (JST) (envelope-from penguin-kernel@i-love.sakura.ne.jp) X-Nat-Received: from [202.181.97.72]:50013 [ident-empty] by smtp-proxy.isp with TPROXY id 1290053000.11276 Received: from www262.sakura.ne.jp (localhost [127.0.0.1]) by www262.sakura.ne.jp (8.14.3/8.14.3) with ESMTP id oAI43JdE005078; Thu, 18 Nov 2010 13:03:19 +0900 (JST) (envelope-from penguin-kernel@i-love.sakura.ne.jp) Received: (from i-love@localhost) by www262.sakura.ne.jp (8.14.3/8.14.3/Submit) id oAI43JBT005077; Thu, 18 Nov 2010 13:03:19 +0900 (JST) (envelope-from penguin-kernel@i-love.sakura.ne.jp) Message-Id: <201011180403.oAI43JBT005077@www262.sakura.ne.jp> X-Authentication-Warning: www262.sakura.ne.jp: i-love set sender to penguin-kernel@i-love.sakura.ne.jp using -f Subject: [PATCH 2.6.37-rc2] Fix duplicate volatile warning. From: Tetsuo Handa To: eric.dumazet@gmail.com Cc: netdev@vger.kernel.org MIME-Version: 1.0 Date: Thu, 18 Nov 2010 13:03:19 +0900 X-Anti-Virus: Kaspersky Anti-Virus for Linux Mail Server 5.6.44/RELEASE, bases: 18112010 #4299098, status: clean Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Commit 0ed8ddf4 "neigh: Protect neigh->ha[] with a seqlock" made gcc 3.x to warn include/net/neighbour.h: In function `neigh_event_send': include/net/neighbour.h:306: warning: duplicate `volatile' . ---------------------------------------- From a391f571f21bfa81369599f03e86fa75589291a3 Mon Sep 17 00:00:00 2001 From: Tetsuo Handa Date: Thu, 18 Nov 2010 12:44:26 +0900 Subject: [PATCH 2.6.37-rc2] Fix duplicate volatile warning. jiffies is defined as "volatile". extern unsigned long volatile __jiffy_data jiffies; ACCESS_ONCE() uses "volatile". As a result, some compilers warn duplicate `volatile' for ACCESS_ONCE(jiffies). Signed-off-by: Tetsuo Handa --- include/net/neighbour.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/net/neighbour.h b/include/net/neighbour.h index 55590ab..6beb1ff 100644 --- a/include/net/neighbour.h +++ b/include/net/neighbour.h @@ -303,7 +303,7 @@ static inline void neigh_confirm(struct neighbour *neigh) static inline int neigh_event_send(struct neighbour *neigh, struct sk_buff *skb) { - unsigned long now = ACCESS_ONCE(jiffies); + unsigned long now = jiffies; if (neigh->used != now) neigh->used = now;