Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762565AbXHUG6z (ORCPT ); Tue, 21 Aug 2007 02:58:55 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755934AbXHUGzV (ORCPT ); Tue, 21 Aug 2007 02:55:21 -0400 Received: from canuck.infradead.org ([209.217.80.40]:44328 "EHLO canuck.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760343AbXHUGzS (ORCPT ); Tue, 21 Aug 2007 02:55:18 -0400 Date: Mon, 20 Aug 2007 23:55:54 -0700 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org, patches@x86-64.org Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , Michael Krufky , Chuck Ebbert , Domenico Andreoli , torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Andi Kleen , Greg Kroah-Hartman Subject: [patch 17/20] x86_64: Change PMDS invocation to single macro Message-ID: <20070821065554.GR5275@kroah.com> References: <20070821064251.972690753@blue.kroah.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline; filename="x86_64-change-pmds-invocation-to-single-macro.patch" In-Reply-To: <20070821065210.GA5275@kroah.com> User-Agent: Mutt/1.5.15 (2007-04-06) X-Bad-Reply: References and In-Reply-To but no 'Re:' in Subject. Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1517 Lines: 38 -stable review patch. If anyone has any objections, please let us know. ------------------ From: Andi Kleen Very old binutils (2.12.90...) seem to have trouble with newlines in assembler macro invocation. They put them into the resulting argument expansion. In this case this lead to a parse error because a .rept expression ended up spread over multiple lines. Change the PMDS() invocation to a single line. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- arch/x86_64/kernel/head.S | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/arch/x86_64/kernel/head.S +++ b/arch/x86_64/kernel/head.S @@ -326,8 +326,7 @@ NEXT_PAGE(level2_kernel_pgt) /* 40MB kernel mapping. The kernel code cannot be bigger than that. When you change this change KERNEL_TEXT_SIZE in page.h too. */ /* (2^48-(2*1024*1024*1024)-((2^39)*511)-((2^30)*510)) = 0 */ - PMDS(0x0000000000000000, __PAGE_KERNEL_LARGE_EXEC|_PAGE_GLOBAL, - KERNEL_TEXT_SIZE/PMD_SIZE) + PMDS(0x0000000000000000, __PAGE_KERNEL_LARGE_EXEC|_PAGE_GLOBAL, KERNEL_TEXT_SIZE/PMD_SIZE) /* Module mapping starts here */ .fill (PTRS_PER_PMD - (KERNEL_TEXT_SIZE/PMD_SIZE)),8,0 -- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/