* [tip: core/mm] microblaze/mm/highmem: Add dropped #ifdef back
@ 2020-11-19 19:51 tip-bot2 for Thomas Gleixner
0 siblings, 0 replies; only message in thread
From: tip-bot2 for Thomas Gleixner @ 2020-11-19 19:51 UTC (permalink / raw)
To: linux-tip-commits
Cc: Randy Dunlap, Thomas Gleixner, Michal Simek, x86, linux-kernel
The following commit has been merged into the core/mm branch of tip:
Commit-ID: a0e169978303ee5873142599c8c9660b2d296243
Gitweb: https://git.kernel.org/tip/a0e169978303ee5873142599c8c9660b2d296243
Author: Thomas Gleixner <tglx@linutronix.de>
AuthorDate: Thu, 19 Nov 2020 20:45:03 +01:00
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Thu, 19 Nov 2020 20:49:44 +01:00
microblaze/mm/highmem: Add dropped #ifdef back
The conversion to generic kmap atomic broke microblaze by removing the
build fail.
Add it back.
Fixes: 7ac1b26b0a72 ("microblaze/mm/highmem: Switch to generic kmap atomic")
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Michal Simek <monstr@monstr.eu>
---
arch/microblaze/mm/init.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c
index 1f4b5b3..a444778 100644
--- a/arch/microblaze/mm/init.c
+++ b/arch/microblaze/mm/init.c
@@ -49,6 +49,7 @@ unsigned long lowmem_size;
EXPORT_SYMBOL(min_low_pfn);
EXPORT_SYMBOL(max_low_pfn);
+#ifdef CONFIG_HIGHMEM
static void __init highmem_init(void)
{
pr_debug("%x\n", (u32)PKMAP_BASE);
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2020-11-19 19:51 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-19 19:51 [tip: core/mm] microblaze/mm/highmem: Add dropped #ifdef back tip-bot2 for Thomas Gleixner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).