diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2010-04-29 19:53:17 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-04-29 19:53:17 -0400 |
| commit | d9c5841e22231e4e49fd0a1004164e6fce59b7a6 (patch) | |
| tree | e1f589c46b3ff79bbe7b1b2469f6362f94576da6 /fs/ecryptfs/messaging.c | |
| parent | b701a47ba48b698976fb2fe05fb285b0edc1d26a (diff) | |
| parent | 5967ed87ade85a421ef814296c3c7f182b08c225 (diff) | |
Merge branch 'x86/asm' into x86/atomic
Merge reason:
Conflict between LOCK_PREFIX_HERE and relative alternatives
pointers
Resolved Conflicts:
arch/x86/include/asm/alternative.h
arch/x86/kernel/alternative.c
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'fs/ecryptfs/messaging.c')
| -rw-r--r-- | fs/ecryptfs/messaging.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ecryptfs/messaging.c b/fs/ecryptfs/messaging.c index f1c17e87c5fb..2d8dbce9d485 100644 --- a/fs/ecryptfs/messaging.c +++ b/fs/ecryptfs/messaging.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | * 02111-1307, USA. | 20 | * 02111-1307, USA. |
| 21 | */ | 21 | */ |
| 22 | #include <linux/sched.h> | 22 | #include <linux/sched.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | #include <linux/user_namespace.h> | 24 | #include <linux/user_namespace.h> |
| 24 | #include <linux/nsproxy.h> | 25 | #include <linux/nsproxy.h> |
| 25 | #include "ecryptfs_kernel.h" | 26 | #include "ecryptfs_kernel.h" |