From patchwork Wed Apr 14 12:50:07 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Dobriyan X-Patchwork-Id: 50063 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 49D22B7CF3 for ; Tue, 13 Apr 2010 21:50:19 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751219Ab0DMLtm (ORCPT ); Tue, 13 Apr 2010 07:49:42 -0400 Received: from mail-bw0-f219.google.com ([209.85.218.219]:62388 "EHLO mail-bw0-f219.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751099Ab0DMLtl (ORCPT ); Tue, 13 Apr 2010 07:49:41 -0400 Received: by bwz19 with SMTP id 19so204bwz.21 for ; Tue, 13 Apr 2010 04:49:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:references:mime-version:content-type:content-disposition :in-reply-to:user-agent; bh=Mg7nr7jHUartubFTWwiiu32fVemlxYVyWHJ+xh5oxoI=; b=jwuGeuBrvtpovpT98/7oWBW5ViKUK0kF27pAdmjbuYmfVVMnJbn5Rrmr6npuWbZL2S cMKHTPDOoD4A7GUAuUUnxauydWWBH6QoxcC8pvTBzhDoonEAoZ5WVKqqdpcwUcQSgZGr LO4h/BwRIqYbc5m7i+6v0mzaCHi7WNknCysXY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; b=IRZIcTUQaO0u4+swIHCan5T9De2rKFMKFEpWoKKPzcFDnKv+qs/neGFKaMFWSPtVwv k/QEa6h5LwpYLInWvg+WDKqiDkTX9A/BqrikLYahkL5WQedDjVsD4/OsYKyVn1LxiaoO 7Vg1VxlVFqvHrloY/XEcLIV0uDRLQk0Yapav0= Received: by 10.102.170.9 with SMTP id s9mr2994681mue.77.1271159377058; Tue, 13 Apr 2010 04:49:37 -0700 (PDT) Received: from x200 ([178.125.99.21]) by mx.google.com with ESMTPS id j2sm22507028mue.23.2010.04.13.04.49.28 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 13 Apr 2010 04:49:36 -0700 (PDT) Date: Wed, 14 Apr 2010 15:50:07 +0300 From: Alexey Dobriyan To: Patrick McHardy Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, shemminger@vyatta.com, bhutchings@solarflare.com, andreas@fatal.se, hadi@cyberus.ca, hideaki@yoshifuji.org Subject: Re: [PATCH v2] xtables: make XT_ALIGN() usable in exported headers by exporting __ALIGN_KERNEL() Message-ID: <20100414125007.GB25686@x200> References: <20100407162245.GA4557@x200> <4BC437C6.8020602@trash.net> <4BC44117.80901@trash.net> <20100414120712.GA25686@x200> <4BC450A4.1010200@trash.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <4BC450A4.1010200@trash.net> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Tue, Apr 13, 2010 at 01:08:20PM +0200, Patrick McHardy wrote: > Alexey Dobriyan wrote: > > XT_ALIGN() was rewritten through ALIGN() by commit 42107f5009da223daa800d6da6904d77297ae829 > > "netfilter: xtables: symmetric COMPAT_XT_ALIGN definition". > > ALIGN() is not exported in userspace headers, which created compile problem for tc(8) > > and will create problem for iptables(8). > > > > We can't export generic looking name ALIGN() but we can export less generic > > __ALIGN_KERNEL() (suggested by Ben Hutchings). > > Google knows nothing about __ALIGN_KERNEL(). > > > > COMPAT_XT_ALIGN() changed for symmetry. > > I've already pushed your change out, could you send me an incremental > fix please? > > master.kernel.org:/pub/scm/linux/kernel/git/kaber/nf-next-2.6.git [PATCH] Restore __ALIGN_MASK() Fix lib/bitmap.c compile failure due to __ALIGN_KERNEL changes. --- -- 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 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -40,6 +40,7 @@ extern const char linux_proc_banner[]; #define STACK_MAGIC 0xdeadbeef #define ALIGN(x, a) __ALIGN_KERNEL((x), (a)) +#define __ALIGN_MASK(x, mask) __ALIGN_KERNEL_MASK((x), (mask)) #define PTR_ALIGN(p, a) ((typeof(p))ALIGN((unsigned long)(p), (a))) #define IS_ALIGNED(x, a) (((x) & ((typeof(x))(a) - 1)) == 0)