From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 17 Apr 2012 02:28:35 +0000 (+1000)
Subject: Merge remote-tracking branch 'security/next'
X-Git-Tag: next-20120417~27
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=12b55fdddbe47a104b5c1b335aa6f5c6c7bcb69a;p=karo-tx-linux.git

Merge remote-tracking branch 'security/next'

Conflicts:
	include/linux/filter.h
---

12b55fdddbe47a104b5c1b335aa6f5c6c7bcb69a
diff --cc include/linux/filter.h
index 72090994d789,f2e53152e835..82b01357af8b
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
@@@ -232,7 -239,7 +243,8 @@@ enum 
  	BPF_S_ANC_HATYPE,
  	BPF_S_ANC_RXHASH,
  	BPF_S_ANC_CPU,
 +	BPF_S_ANC_ALU_XOR_X,
+ 	BPF_S_ANC_SECCOMP_LD_W,
  };
  
  #endif /* __KERNEL__ */
diff --cc include/linux/seccomp.h
index cc7a4e9cc7ad,5818e869651b..60f2b350ead7
--- a/include/linux/seccomp.h
+++ b/include/linux/seccomp.h
@@@ -28,9 -87,10 +87,10 @@@ static inline int seccomp_mode(struct s
  
  #include <linux/errno.h>
  
- typedef struct { } seccomp_t;
+ struct seccomp { };
+ struct seccomp_filter { };
  
- #define secure_computing(x) do { } while (0)
 -#define secure_computing(x) 0
++static inline int secure_computing(int this_syscall) { return 0; }
  
  static inline long prctl_get_seccomp(void)
  {