diff options
| author |   Steve French <sfrench@us.ibm.com> | 2006-01-23 12:51:00 -0800 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-01-23 12:51:00 -0800 |
| commit | 4c8af5254e741983e141e10002e01abba87f8419 (patch) | |
| tree | a932954630715a0e9b4f20fdfe74255b441096c5 /include/linux | |
| parent | [CIFS] Do not zero non-existent iovec in SendReceive response processing. (diff) | |
| parent | [SPARC64]: Use compat_sys_futimesat in 32-bit syscall table. (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/netfilter/x_tables.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h index 472f04834809..59ff6c430cf6 100644 --- a/include/linux/netfilter/x_tables.h +++ b/include/linux/netfilter/x_tables.h @@ -19,7 +19,7 @@ struct xt_get_revision /* For standard target */ #define XT_RETURN (-NF_REPEAT - 1) -#define XT_ALIGN(s) (((s) + (__alignof__(void *)-1)) & ~(__alignof__(void *)-1)) +#define XT_ALIGN(s) (((s) + (__alignof__(u_int64_t)-1)) & ~(__alignof__(u_int64_t)-1)) /* Standard return verdict, or do jump. */ #define XT_STANDARD_TARGET "" |