summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-09-25 09:00:02 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-09-25 09:00:02 -0700
commite108a3c3268d4539e4ae538aa41bca1afb15dc3e (patch)
treee658e24728861006e7632fcb61eae467b7840eb8 /include
parent56d27adcb536b7430d5f8a6240df8ad261eb00bd (diff)
parentbe8cfc4af15cf611dfeb66a1fb5df43d5f1e280a (diff)
Merge branch 'akpm' (sundry from Andrew)
Merge misc fixes from Andrew Morton: "One maintainer change and three bugfixes" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (4 commits) c/r: prctl: fix build error for no-MMU case lib/flex_proportions.c: fix corruption of denominator in flexible proportions checksyscalls: fix "here document" handling pwm-backlight: take over maintenance
Diffstat (limited to 'include')
-rw-r--r--include/linux/security.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/security.h b/include/linux/security.h
index 3dea6a9d568f..d143b8e01954 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -118,6 +118,7 @@ void reset_security_ops(void);
extern unsigned long mmap_min_addr;
extern unsigned long dac_mmap_min_addr;
#else
+#define mmap_min_addr 0UL
#define dac_mmap_min_addr 0UL
#endif