diff options
| author | Mark Salter <msalter@redhat.com> | 2012-09-24 17:17:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-25 08:59:21 -0700 |
| commit | be8cfc4af15cf611dfeb66a1fb5df43d5f1e280a (patch) | |
| tree | b84efb3a6189633a5e3f1a210971f28a0d68dac4 | |
| parent | b5bd6a0e5fa8c0376d9746c566fe3daaa51ec825 (diff) | |
| download | linux-stable-be8cfc4af15cf611dfeb66a1fb5df43d5f1e280a.tar.gz linux-stable-be8cfc4af15cf611dfeb66a1fb5df43d5f1e280a.tar.bz2 linux-stable-be8cfc4af15cf611dfeb66a1fb5df43d5f1e280a.zip | |
c/r: prctl: fix build error for no-MMU case
Commit 1ad75b9e1628 ("c/r: prctl: add minimal address test to
PR_SET_MM") added some address checking to prctl_set_mm() used by
checkpoint-restore. This causes a build error for no-MMU systems:
kernel/sys.c: In function 'prctl_set_mm':
kernel/sys.c:1868:34: error: 'mmap_min_addr' undeclared (first use in this function)
The test for mmap_min_addr doesn't make a lot of sense for no-MMU code
as noted in commit 6e1415467614 ("NOMMU: Optimise away the
{dac_,}mmap_min_addr tests").
This patch defines mmap_min_addr as 0UL in the no-MMU case so that the
compiler will optimize away tests for "addr < mmap_min_addr".
Signed-off-by: Mark Salter <msalter@redhat.com>
Reviewed-by: Cyrill Gorcunov <gorcunov@openvz.org>
Cc: <stable@vger.kernel.org> [3.6.x]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | include/linux/security.h | 1 |
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 |