diff --git a/[refs] b/[refs] index 2d28a526ea04..c1300aba1fd1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b5bd6a0e5fa8c0376d9746c566fe3daaa51ec825 +refs/heads/master: be8cfc4af15cf611dfeb66a1fb5df43d5f1e280a diff --git a/trunk/include/linux/security.h b/trunk/include/linux/security.h index 3dea6a9d568f..d143b8e01954 100644 --- a/trunk/include/linux/security.h +++ b/trunk/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