From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <stable-owner@vger.kernel.org>
Received: from mail.kernel.org ([198.145.29.99]:36006 "EHLO mail.kernel.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1726026AbeKBXEG (ORCPT <rfc822;stable@vger.kernel.org>);
        Fri, 2 Nov 2018 19:04:06 -0400
Date: Fri, 2 Nov 2018 09:56:45 -0400
From: Sasha Levin <sashal@kernel.org>
To: Feng Tang <feng.tang@intel.com>
Cc: Ben Hutchings <ben@decadent.org.uk>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        linux-kernel@vger.kernel.org, stable@vger.kernel.org,
        Thomas Gleixner <tglx@linutronix.de>,
        kernel test robot <rong.a.chen@intel.com>,
        H Peter Anvin <hpa@linux.intel.com>,
        Peter Zijlstra <peterz@infradead.org>,
        Michal Hocko <mhocko@kernel.org>,
        Yinghai Lu <yinghai@kernel.org>,
        Dave Hansen <dave.hansen@intel.com>,
        Andi Kleen <ak@linux.intel.com>,
        Andy Lutomirsky <luto@kernel.org>
Subject: Re: [PATCH 4.9 23/35] x86/mm: Expand static page table for fixmap
 space
Message-ID: <20181102135645.GE194472@sasha-vm>
References: <20181011152520.174949126@linuxfoundation.org>
 <20181011152521.098965859@linuxfoundation.org>
 <5d134c818828ddecf1ab9768b126c15c267c099e.camel@decadent.org.uk>
 <20181102033813.mxauelisrform7ah@shbuild888>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Disposition: inline
In-Reply-To: <20181102033813.mxauelisrform7ah@shbuild888>
Sender: stable-owner@vger.kernel.org
List-ID: <stable.vger.kernel.org>

On Fri, Nov 02, 2018 at 11:38:13AM +0800, Feng Tang wrote:
>Hi Ben,
>
>On Thu, Nov 01, 2018 at 10:25:43PM +0000, Ben Hutchings wrote:
>> On Thu, 2018-10-11 at 17:35 +0200, Greg Kroah-Hartman wrote:
>> > 4.9-stable review patch.  If anyone has any objections, please let me know.
>> >
>> > ------------------
>> >
>> > From: Feng Tang <feng.tang@intel.com>
>> >
>> > commit 05ab1d8a4b36ee912b7087c6da127439ed0a903e upstream.
>>
>> This backport is incorrect.  The part that updated __startup_64() in
>> arch/x86/kernel/head64.c was dropped, presumably because that function
>> doesn't exist in 4.9.  However that seems to be an essential of the
>> fix.  In 4.9 the startup_64 routine in arch/x86/kernel/head_64.S would
>> need to be changed instead.
>>
>> I also found that this introduces new boot-time warnings on some
>> systems if CONFIG_DEBUG_WX is enabled.
>>
>> So, unless someone provides fixes for those issues, I think this should
>> be reverted for the 4.9 branch.
>
>Thanks for the catch, I'm fine with the revert for now.

I've queued the revert, thank you.

--
Thanks,
Sasha