From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757391Ab0ECHok (ORCPT ); Mon, 3 May 2010 03:44:40 -0400 Received: from hera.kernel.org ([140.211.167.34]:43761 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753105Ab0ECHoh (ORCPT ); Mon, 3 May 2010 03:44:37 -0400 Date: Mon, 3 May 2010 07:44:02 GMT From: tip-bot for Ingo Molnar Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com, yinghai@kernel.org, konrad.wilk@oracle.com, liang.li@windriver.com, wangchen@cn.fujitsu.com, jeremy.fitzhardinge@citrix.com, akpm@linux-foundation.org, tglx@linutronix.de, mingo@elte.hu Reply-To: mingo@redhat.com, hpa@zytor.com, linux-kernel@vger.kernel.org, liang.li@windriver.com, konrad.wilk@oracle.com, yinghai@kernel.org, wangchen@cn.fujitsu.com, jeremy.fitzhardinge@citrix.com, akpm@linux-foundation.org, tglx@linutronix.de, mingo@elte.hu In-Reply-To: <1272621711-8683-1-git-send-email-liang.li@windriver.com> References: <1272621711-8683-1-git-send-email-liang.li@windriver.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] x86: Fix parse_reservetop() build failure on certain configs Message-ID: Git-Commit-ID: 56f0e74c9cf98941af700b61466648a2d06277bb X-Mailer: tip-git-log-daemon MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.3 (hera.kernel.org [127.0.0.1]); Mon, 03 May 2010 07:44:04 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 56f0e74c9cf98941af700b61466648a2d06277bb Gitweb: http://git.kernel.org/tip/56f0e74c9cf98941af700b61466648a2d06277bb Author: Ingo Molnar AuthorDate: Mon, 3 May 2010 09:19:43 +0200 Committer: Ingo Molnar CommitDate: Mon, 3 May 2010 09:22:19 +0200 x86: Fix parse_reservetop() build failure on certain configs Commit e67a807 ("x86: Fix 'reservetop=' functionality") added a fixup_early_ioremap() call to parse_reservetop() and declared it in io.h. But asm/io.h was only included indirectly - and on some configs not at all, causing a build failure on those configs. Cc: Liang Li Cc: Konrad Rzeszutek Wilk Cc: Yinghai Lu Cc: Jeremy Fitzhardinge Cc: Wang Chen Cc: "H. Peter Anvin" Cc: Andrew Morton LKML-Reference: <1272621711-8683-1-git-send-email-liang.li@windriver.com> Signed-off-by: Ingo Molnar --- arch/x86/mm/pgtable_32.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c index 26eadaa..7928540 100644 --- a/arch/x86/mm/pgtable_32.c +++ b/arch/x86/mm/pgtable_32.c @@ -18,6 +18,7 @@ #include #include #include +#include unsigned int __VMALLOC_RESERVE = 128 << 20;