From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754055AbcG0JFg (ORCPT <rfc822;w@1wt.eu>);
	Wed, 27 Jul 2016 05:05:36 -0400
Received: from mail-wm0-f66.google.com ([74.125.82.66]:33807 "EHLO
	mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752547AbcG0JFc (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Wed, 27 Jul 2016 05:05:32 -0400
Date: Wed, 27 Jul 2016 11:05:16 +0200
From: Ingo Molnar <mingo@kernel.org>
To: Borislav Petkov <bp@suse.de>
Cc: Kees Cook <keescook@chromium.org>, Thomas Garnier <thgarnie@google.com>,
        Nicolai Stange <nicstange@gmail.com>,
        Thomas Gleixner <tglx@linutronix.de>, "H. Peter Anvin" <hpa@zytor.com>,
        Peter Zijlstra <peterz@infradead.org>,
        "linux-tip-commits@vger.kernel.org" 
	<linux-tip-commits@vger.kernel.org>,
        LKML <linux-kernel@vger.kernel.org>,
        Linus Torvalds <torvalds@linux-foundation.org>
Subject: Re: [PATCH -v2 1/2] x86/asm: Add __PAGE_OFFSET_BASE define on 32-bit
Message-ID: <20160727090516.GC30204@gmail.com>
References: <20160726095138.3470-1-bp@alien8.de>
 <tip-efaad554b4ffae1840a2759e09e21325ddbc8b05@git.kernel.org>
 <CAGXu5jLWbdKMzAKSpwBwF2r0GF5292Ky5OtRafPZCjfpLW91UA@mail.gmail.com>
 <20160727054543.GB3142@nazgul.tnic>
 <20160727080917.GA3009@nazgul.tnic>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20160727080917.GA3009@nazgul.tnic>
User-Agent: Mutt/1.5.24 (2015-08-30)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


* Borislav Petkov <bp@suse.de> wrote:

> From: Borislav Petkov <bp@suse.de>
> 
> ... in order to avoid ifdeffery in code computing the ASLR randomization
> offset.
> 
> Suggested-by: Kees Cook <keescook@chromium.org>
> Signed-off-by: Borislav Petkov <bp@suse.de>
> ---
>  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

Could you please send a delta patch for this? I've already applied the original 
fix, with a few minor edits.

Thanks,

	Ingo