diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-05 19:41:22 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-05 19:41:22 -0400 |
| commit | 9efe21cb82b5dbe3b0b2ae4de4eccc64ecb94e95 (patch) | |
| tree | 7ff8833745d2f268f897f6fa4a27263b4a572245 /include/linux/xfrm.h | |
| parent | de18836e447c2dc30120c0919b8db8ddc0401cc4 (diff) | |
| parent | 0221c81b1b8eb0cbb6b30a0ced52ead32d2b4e4c (diff) | |
Merge branch 'linus' into irq/threaded
Conflicts:
include/linux/irq.h
kernel/irq/handle.c
Diffstat (limited to 'include/linux/xfrm.h')
| -rw-r--r-- | include/linux/xfrm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h index 52f3abd453a1..2d4ec15abaca 100644 --- a/include/linux/xfrm.h +++ b/include/linux/xfrm.h | |||
| @@ -58,7 +58,7 @@ struct xfrm_selector | |||
| 58 | __u8 prefixlen_s; | 58 | __u8 prefixlen_s; |
| 59 | __u8 proto; | 59 | __u8 proto; |
| 60 | int ifindex; | 60 | int ifindex; |
| 61 | uid_t user; | 61 | __kernel_uid32_t user; |
| 62 | }; | 62 | }; |
| 63 | 63 | ||
| 64 | #define XFRM_INF (~(__u64)0) | 64 | #define XFRM_INF (~(__u64)0) |