git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
netfilter: xtables: make XT_ALIGN() usable in exported headers by exporting __ALIGN_K...
[safe/jmp/linux-2.6]
/
include
/
linux
/
netfilter
/
x_tables.h
diff --git
a/include/linux/netfilter/x_tables.h
b/include/linux/netfilter/x_tables.h
index
1a65d45
..
26ced0c
100644
(file)
--- a/
include/linux/netfilter/x_tables.h
+++ b/
include/linux/netfilter/x_tables.h
@@
-1,6
+1,6
@@
#ifndef _X_TABLES_H
#define _X_TABLES_H
#ifndef _X_TABLES_H
#define _X_TABLES_H
-
+#include <linux/kernel.h>
#include <linux/types.h>
#define XT_FUNCTION_MAXNAMELEN 30
#include <linux/types.h>
#define XT_FUNCTION_MAXNAMELEN 30
@@
-93,7
+93,7
@@
struct _xt_align {
__u64 u64;
};
__u64 u64;
};
-#define XT_ALIGN(s)
ALIGN
((s), __alignof__(struct _xt_align))
+#define XT_ALIGN(s)
__ALIGN_KERNEL
((s), __alignof__(struct _xt_align))
/* Standard return verdict, or do jump. */
#define XT_STANDARD_TARGET ""
/* Standard return verdict, or do jump. */
#define XT_STANDARD_TARGET ""
@@
-603,7
+603,7
@@
struct _compat_xt_align {
compat_u64 u64;
};
compat_u64 u64;
};
-#define COMPAT_XT_ALIGN(s)
ALIGN
((s), __alignof__(struct _compat_xt_align))
+#define COMPAT_XT_ALIGN(s)
__ALIGN_KERNEL
((s), __alignof__(struct _compat_xt_align))
extern void xt_compat_lock(u_int8_t af);
extern void xt_compat_unlock(u_int8_t af);
extern void xt_compat_lock(u_int8_t af);
extern void xt_compat_unlock(u_int8_t af);