diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-26 16:11:41 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-26 16:11:41 -0700 |
commit | ba1eb95cf3cc666769afe42eaa15a3a34ae82f94 (patch) | |
tree | 011d8a65ad6e605741a66a833c3536394e8d0f3e /include/linux/netfilter_ipv4 | |
parent | a8416961d32d8bb757bcbb86b72042b66d044510 (diff) | |
parent | 17d140402e6f0fd5dde2fdf8d045e3f95f865663 (diff) | |
download | kernel_samsung_smdk4412-ba1eb95cf3cc666769afe42eaa15a3a34ae82f94.zip kernel_samsung_smdk4412-ba1eb95cf3cc666769afe42eaa15a3a34ae82f94.tar.gz kernel_samsung_smdk4412-ba1eb95cf3cc666769afe42eaa15a3a34ae82f94.tar.bz2 |
Merge branch 'header-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'header-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (50 commits)
x86: headers cleanup - setup.h
emu101k1.h: fix duplicate include of <linux/types.h>
compiler-gcc4: conditionalize #error on __KERNEL__
remove __KERNEL_STRICT_NAMES
make netfilter use strict integer types
make drm headers use strict integer types
make MTD headers use strict integer types
make most exported headers use strict integer types
make exported headers use strict posix types
unconditionally include asm/types.h from linux/types.h
make linux/types.h as assembly safe
Neither asm/types.h nor linux/types.h is required for arch/ia64/include/asm/fpu.h
headers_check fix cleanup: linux/reiserfs_fs.h
headers_check fix cleanup: linux/nubus.h
headers_check fix cleanup: linux/coda_psdev.h
headers_check fix: x86, setup.h
headers_check fix: x86, prctl.h
headers_check fix: linux/reinserfs_fs.h
headers_check fix: linux/socket.h
headers_check fix: linux/nubus.h
...
Manually fix trivial conflicts in:
include/linux/netfilter/xt_limit.h
include/linux/netfilter/xt_statistic.h
Diffstat (limited to 'include/linux/netfilter_ipv4')
-rw-r--r-- | include/linux/netfilter_ipv4/ipt_owner.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/netfilter_ipv4/ipt_owner.h b/include/linux/netfilter_ipv4/ipt_owner.h index 92f4bda..a78445b 100644 --- a/include/linux/netfilter_ipv4/ipt_owner.h +++ b/include/linux/netfilter_ipv4/ipt_owner.h @@ -9,10 +9,10 @@ #define IPT_OWNER_COMM 0x10 struct ipt_owner_info { - uid_t uid; - gid_t gid; - pid_t pid; - pid_t sid; + __kernel_uid32_t uid; + __kernel_gid32_t gid; + __kernel_pid_t pid; + __kernel_pid_t sid; char comm[16]; u_int8_t match, invert; /* flags */ }; |