From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757636AbcBWJKv (ORCPT ); Tue, 23 Feb 2016 04:10:51 -0500 Received: from terminus.zytor.com ([198.137.202.10]:58360 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757612AbcBWJKr (ORCPT ); Tue, 23 Feb 2016 04:10:47 -0500 Date: Mon, 22 Feb 2016 04:17:42 -0800 From: =?UTF-8?B?dGlwLWJvdCBmb3IgU2FpIFByYW5lZXRoIDx0aXBib3RAenl0b3IuY29tPg==?=@zytor.com Message-ID: Cc: ravi.v.shankar@intel.com, sai.praneeth.prakhya@intel.com, ard.biesheuvel@linaro.org, peterz@infradead.org, tglx@linutronix.de, ricardo.neri@intel.com, matt@codeblueprint.co.uk, torvalds@linux-foundation.org, hpa@zytor.com, bp@alien8.de, linux-kernel@vger.kernel.org, mingo@kernel.org Reply-To: peterz@infradead.org, tglx@linutronix.de, ard.biesheuvel@linaro.org, sai.praneeth.prakhya@intel.com, ravi.v.shankar@intel.com, mingo@kernel.org, linux-kernel@vger.kernel.org, bp@alien8.de, hpa@zytor.com, torvalds@linux-foundation.org, matt@codeblueprint.co.uk, ricardo.neri@intel.com In-Reply-To: <1455712566-16727-14-git-send-email-matt@codeblueprint.co.uk> References: <1455712566-16727-14-git-send-email-matt@codeblueprint.co.uk> To: =?UTF-8?B?bGludXgtdGlwLWNvbW1pdHNAdmdlci5rZXJuZWwub3Jn?=@zytor.com Subject: =?UTF-8?B?W3RpcDplZmkvY29yZV0geDg2L2VmaTogT25seSBtYXAga2VybmVsIHRleHQgZm8=?= =?UTF-8?B?ciBFRkkgbWl4ZWQgbW9kZQ==?= Git-Commit-ID: =?UTF-8?B?MmFkNTEwZGMzNzJjMmNhYWM5YWFkYTlmZjZkZDEwZTc4NzYxNmUxZA==?= X-Mailer: =?UTF-8?B?dGlwLWdpdC1sb2ctZGFlbW9u?= Robot-ID: =?UTF-8?B?PHRpcC1ib3QuZ2l0Lmtlcm5lbC5vcmc+?= Robot-Unsubscribe: =?UTF-8?B?Q29udGFjdCA8bWFpbHRvOmhwYUBrZXJuZWwub3JnPiB0byBnZXQgYmxhY2tsaXM=?= =?UTF-8?B?dGVkIGZyb20gdGhlc2UgZW1haWxz?= MIME-Version: =?UTF-8?B?MS4w?= Content-Transfer-Encoding: =?UTF-8?B?OGJpdA==?= Content-Type: =?UTF-8?B?dGV4dC9wbGFpbjsgY2hhcnNldD1VVEYtOA==?= Content-Disposition: =?UTF-8?B?aW5saW5l?= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 2ad510dc372c2caac9aada9ff6dd10e787616e1d Gitweb: http://git.kernel.org/tip/2ad510dc372c2caac9aada9ff6dd10e787616e1d Author: Sai Praneeth AuthorDate: Wed, 17 Feb 2016 12:36:06 +0000 Committer: Ingo Molnar CommitDate: Mon, 22 Feb 2016 08:26:28 +0100 x86/efi: Only map kernel text for EFI mixed mode The correct symbol to use when figuring out the size of the kernel text is '_etext', not '_end' which is the symbol for the entire kernel image includes data and debug sections. Signed-off-by: Sai Praneeth Prakhya Signed-off-by: Matt Fleming Cc: Ard Biesheuvel Cc: Borislav Petkov Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Ravi Shankar Cc: Ricardo Neri Cc: Thomas Gleixner Cc: linux-efi@vger.kernel.org Link: http://lkml.kernel.org/r/1455712566-16727-14-git-send-email-matt@codeblueprint.co.uk Signed-off-by: Ingo Molnar --- arch/x86/platform/efi/efi_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c index 40d2f44..49e4dd4 100644 --- a/arch/x86/platform/efi/efi_64.c +++ b/arch/x86/platform/efi/efi_64.c @@ -275,7 +275,7 @@ int __init efi_setup_page_tables(unsigned long pa_memmap, unsigned num_pages) efi_scratch.phys_stack = virt_to_phys(page_address(page)); efi_scratch.phys_stack += PAGE_SIZE; /* stack grows down */ - npages = (_end - _text) >> PAGE_SHIFT; + npages = (_etext - _text) >> PAGE_SHIFT; text = __pa(_text); pfn = text >> PAGE_SHIFT;