From patchwork Mon Mar 5 23:12:35 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 144804 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id DC7C2B6FA3 for ; Tue, 6 Mar 2012 10:42:45 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757429Ab2CEXmn (ORCPT ); Mon, 5 Mar 2012 18:42:43 -0500 Received: from mail-fa0-f74.google.com ([209.85.161.74]:44785 "EHLO mail-fa0-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756678Ab2CEXmn (ORCPT ); Mon, 5 Mar 2012 18:42:43 -0500 Received: by faaa19 with SMTP id a19so168564faa.1 for ; Mon, 05 Mar 2012 15:42:42 -0800 (PST) Received-SPF: pass (google.com: domain of akpm@linux-foundation.org designates 10.213.27.15 as permitted sender) client-ip=10.213.27.15; Authentication-Results: mr.google.com; spf=pass (google.com: domain of akpm@linux-foundation.org designates 10.213.27.15 as permitted sender) smtp.mail=akpm@linux-foundation.org Received: from mr.google.com ([10.213.27.15]) by 10.213.27.15 with SMTP id g15mr1760927ebc.7.1330990962369 (num_hops = 1); Mon, 05 Mar 2012 15:42:42 -0800 (PST) Received: by 10.213.27.15 with SMTP id g15mr1513708ebc.7.1330989156833; Mon, 05 Mar 2012 15:12:36 -0800 (PST) Received: from hpza9.eem.corp.google.com ([74.125.121.33]) by gmr-mx.google.com with ESMTPS id s9si9636694eei.3.2012.03.05.15.12.36 (version=TLSv1/SSLv3 cipher=AES128-SHA); Mon, 05 Mar 2012 15:12:36 -0800 (PST) Received: from akpm.mtv.corp.google.com (akpm.mtv.corp.google.com [172.18.96.75]) by hpza9.eem.corp.google.com (Postfix) with ESMTP id A04C55C0050; Mon, 5 Mar 2012 15:12:36 -0800 (PST) Received: from localhost.localdomain (localhost [127.0.0.1]) by akpm.mtv.corp.google.com (Postfix) with ESMTP id 00A45A02EB; Mon, 5 Mar 2012 15:12:36 -0800 (PST) Subject: [patch 1/1] net/netfilter/nfnetlink_acct.c: use linux/atomic.h To: kaber@trash.net Cc: netfilter-devel@vger.kernel.org, akpm@linux-foundation.org, davem@davemloft.net, pablo@netfilter.org From: akpm@linux-foundation.org Date: Mon, 05 Mar 2012 15:12:35 -0800 MIME-Version: 1.0 Message-Id: <20120305231236.00A45A02EB@akpm.mtv.corp.google.com> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org From: Andrew Morton Subject: net/netfilter/nfnetlink_acct.c: use linux/atomic.h There's no known problem here, but this is one of only two non-arch files in the kernel which use asm/atomic.h instead of linux/atomic.h. Acked-by: Pablo Neira Ayuso Cc: Patrick McHardy Cc: "David S. Miller" Signed-off-by: Andrew Morton --- net/netfilter/nfnetlink_acct.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN net/netfilter/nfnetlink_acct.c~net-netfilter-nfnetlink_acctc-use-linux-atomich net/netfilter/nfnetlink_acct.c --- a/net/netfilter/nfnetlink_acct.c~net-netfilter-nfnetlink_acctc-use-linux-atomich +++ a/net/netfilter/nfnetlink_acct.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include @@ -17,7 +18,6 @@ #include #include #include -#include #include #include