Merge branch 'master' into next

[pandora-kernel.git] / include / linux / security.h

diff --git a/include/linux/security.h b/include/linux/security.h
index 3696ca3..26eca85 100644 (file)
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -95,8 +95,13 @@ struct seq_file;
 extern int cap_netlink_send(struct sock *sk, struct sk_buff *skb);
 extern int cap_netlink_recv(struct sk_buff *skb, int cap);
 
 extern int cap_netlink_send(struct sock *sk, struct sk_buff *skb);
 extern int cap_netlink_recv(struct sk_buff *skb, int cap);
 

+#ifdef CONFIG_MMU

 extern unsigned long mmap_min_addr;
 extern unsigned long dac_mmap_min_addr;
 extern unsigned long mmap_min_addr;
 extern unsigned long dac_mmap_min_addr;

+#else
+#define dac_mmap_min_addr      0UL
+#endif
+

 /*
  * Values used in the task_security_ops calls
  */
 /*
  * Values used in the task_security_ops calls
  */


@@ -121,6 +126,7 @@ struct request_sock;
 #define LSM_UNSAFE_PTRACE      2
 #define LSM_UNSAFE_PTRACE_CAP  4
 
 #define LSM_UNSAFE_PTRACE      2
 #define LSM_UNSAFE_PTRACE_CAP  4
 

+#ifdef CONFIG_MMU

 /*
  * If a hint addr is less than mmap_min_addr change hint to be as
  * low as possible but still greater than mmap_min_addr
 /*
  * If a hint addr is less than mmap_min_addr change hint to be as
  * low as possible but still greater than mmap_min_addr


@@ -135,6 +141,7 @@ static inline unsigned long round_hint_to_min(unsigned long hint)
 }
 extern int mmap_min_addr_handler(struct ctl_table *table, int write,
                                 void __user *buffer, size_t *lenp, loff_t *ppos);
 }
 extern int mmap_min_addr_handler(struct ctl_table *table, int write,
                                 void __user *buffer, size_t *lenp, loff_t *ppos);

+#endif

 
 #ifdef CONFIG_SECURITY
 
 
 #ifdef CONFIG_SECURITY