From: Borislav Petkov <[email protected]>

... in order to avoid ifdeffery in code computing the ASLR randomization
offset.

Suggested-by: Kees Cook <[email protected]>
Signed-off-by: Borislav Petkov <[email protected]>
---
 arch/x86/include/asm/page_32_types.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/x86/include/asm/page_32_types.h 
b/arch/x86/include/asm/page_32_types.h
index 3a52ee0e726d..3bae4969ac65 100644
--- a/arch/x86/include/asm/page_32_types.h
+++ b/arch/x86/include/asm/page_32_types.h
@@ -13,7 +13,8 @@
  * If you want more physical memory than this then see the CONFIG_HIGHMEM4G
  * and CONFIG_HIGHMEM64G options in the kernel configuration.
  */
-#define __PAGE_OFFSET          _AC(CONFIG_PAGE_OFFSET, UL)
+#define __PAGE_OFFSET_BASE     _AC(CONFIG_PAGE_OFFSET, UL)
+#define __PAGE_OFFSET          __PAGE_OFFSET_BASE
 
 #define __START_KERNEL_map     __PAGE_OFFSET
 
-- 
2.8.4


-- 
Regards/Gruss,
    Boris.

ECO tip #101: Trim your mails when you reply.

SUSE Linux GmbH, GF: Felix Imendörffer, Jane Smithard, Graham Norton, HRB 21284 
(AG Nürnberg)
--

Reply via email to