From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964853AbcATLOs (ORCPT ); Wed, 20 Jan 2016 06:14:48 -0500 Received: from terminus.zytor.com ([198.137.202.10]:60800 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935188AbcATLOp (ORCPT ); Wed, 20 Jan 2016 06:14:45 -0500 Date: Wed, 20 Jan 2016 03:13:20 -0800 From: tip-bot for Andy Lutomirski Message-ID: Cc: tglx@linutronix.de, pavel@ucw.cz, mingo@kernel.org, brgerst@gmail.com, arjan@linux.intel.com, sds@tycho.nsa.gov, efault@gmx.de, peterz@infradead.org, torvalds@linux-foundation.org, dvlasenk@redhat.com, linux-kernel@vger.kernel.org, bp@alien8.de, luto@amacapital.net, hpa@zytor.com, luto@kernel.org Reply-To: hpa@zytor.com, luto@kernel.org, luto@amacapital.net, bp@alien8.de, linux-kernel@vger.kernel.org, dvlasenk@redhat.com, torvalds@linux-foundation.org, peterz@infradead.org, efault@gmx.de, sds@tycho.nsa.gov, arjan@linux.intel.com, brgerst@gmail.com, pavel@ucw.cz, mingo@kernel.org, tglx@linutronix.de In-Reply-To: <0850eb0213de9da88544ff7fae72dc6d06d2b441.1453239349.git.luto@kernel.org> References: <0850eb0213de9da88544ff7fae72dc6d06d2b441.1453239349.git.luto@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/mm] x86/mm: Make kmap_prot into a #define Git-Commit-ID: 7c360572b430a0e9757bafc0c20f26c920f2a07f X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 7c360572b430a0e9757bafc0c20f26c920f2a07f Gitweb: http://git.kernel.org/tip/7c360572b430a0e9757bafc0c20f26c920f2a07f Author: Andy Lutomirski AuthorDate: Tue, 19 Jan 2016 13:38:59 -0800 Committer: Ingo Molnar CommitDate: Wed, 20 Jan 2016 11:39:14 +0100 x86/mm: Make kmap_prot into a #define The value (once we initialize it) is a foregone conclusion. Make it a #define to save a tiny amount of text and data size and to make it more comprehensible. Signed-off-by: Andy Lutomirski Cc: Andy Lutomirski Cc: Arjan van de Ven Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Mike Galbraith Cc: Pavel Machek Cc: Peter Zijlstra Cc: Stephen Smalley Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/0850eb0213de9da88544ff7fae72dc6d06d2b441.1453239349.git.luto@kernel.org Signed-off-by: Ingo Molnar --- arch/x86/include/asm/fixmap.h | 2 +- arch/x86/mm/init_32.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/arch/x86/include/asm/fixmap.h b/arch/x86/include/asm/fixmap.h index 6d7d0e5..8554f96 100644 --- a/arch/x86/include/asm/fixmap.h +++ b/arch/x86/include/asm/fixmap.h @@ -138,7 +138,7 @@ extern void reserve_top_address(unsigned long reserve); extern int fixmaps_set; extern pte_t *kmap_pte; -extern pgprot_t kmap_prot; +#define kmap_prot PAGE_KERNEL extern pte_t *pkmap_page_table; void __native_set_fixmap(enum fixed_addresses idx, pte_t pte); diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c index cb4ef3d..a4bb1c7 100644 --- a/arch/x86/mm/init_32.c +++ b/arch/x86/mm/init_32.c @@ -388,7 +388,6 @@ repeat: } pte_t *kmap_pte; -pgprot_t kmap_prot; static inline pte_t *kmap_get_fixmap_pte(unsigned long vaddr) { @@ -405,8 +404,6 @@ static void __init kmap_init(void) */ kmap_vstart = __fix_to_virt(FIX_KMAP_BEGIN); kmap_pte = kmap_get_fixmap_pte(kmap_vstart); - - kmap_prot = PAGE_KERNEL; } #ifdef CONFIG_HIGHMEM