From: tip-bot for Andy Lutomirski <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
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
Subject: [tip:x86/mm] x86/mm: Make kmap_prot into a #define
Date: Wed, 20 Jan 2016 03:13:20 -0800 [thread overview]
Message-ID: <tip-7c360572b430a0e9757bafc0c20f26c920f2a07f@git.kernel.org> (raw)
In-Reply-To: <0850eb0213de9da88544ff7fae72dc6d06d2b441.1453239349.git.luto@kernel.org>
Commit-ID: 7c360572b430a0e9757bafc0c20f26c920f2a07f
Gitweb: http://git.kernel.org/tip/7c360572b430a0e9757bafc0c20f26c920f2a07f
Author: Andy Lutomirski <luto@kernel.org>
AuthorDate: Tue, 19 Jan 2016 13:38:59 -0800
Committer: Ingo Molnar <mingo@kernel.org>
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 <luto@kernel.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Arjan van de Ven <arjan@linux.intel.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephen Smalley <sds@tycho.nsa.gov>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/0850eb0213de9da88544ff7fae72dc6d06d2b441.1453239349.git.luto@kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
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
prev parent reply other threads:[~2016-01-20 11:14 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-19 21:38 [PATCH v2 0/2] x86/mm: A _PAGE_NX fixlet and a kmap cleanup Andy Lutomirski
2016-01-19 21:38 ` [PATCH v2 1/2] x86_32/mm: Set NX in __supported_pte_mask before enabling paging Andy Lutomirski
2016-01-20 11:12 ` [tip:x86/mm] x86/mm/32: " tip-bot for Andy Lutomirski
2016-01-19 21:38 ` [PATCH v2 2/2] x86/mm: Make kmap_prot into a #define Andy Lutomirski
2016-01-20 11:13 ` tip-bot for Andy Lutomirski [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-7c360572b430a0e9757bafc0c20f26c920f2a07f@git.kernel.org \
--to=tipbot@zytor.com \
--cc=arjan@linux.intel.com \
--cc=bp@alien8.de \
--cc=brgerst@gmail.com \
--cc=dvlasenk@redhat.com \
--cc=efault@gmx.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=luto@amacapital.net \
--cc=luto@kernel.org \
--cc=mingo@kernel.org \
--cc=pavel@ucw.cz \
--cc=peterz@infradead.org \
--cc=sds@tycho.nsa.gov \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome