lkml.org 
[lkml]   [2010]   [Apr]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectRe: [PATCH v2] xtables: make XT_ALIGN() usable in exported headers by exporting __ALIGN_KERNEL()
    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.

    ---
    --- 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)


    \
     
     \ /
      Last update: 2010-04-13 13:51    [W:0.021 / U:92.404 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site