linux-kernel - [tip: core/mm] microblaze/mm/highmem: Add dropped #ifdef back

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:   Thu, 19 Nov 2020 19:51:15 -0000
From:   "tip-bot2 for Thomas Gleixner" <tip-bot2@...utronix.de>
To:     linux-tip-commits@...r.kernel.org
Cc:     Randy Dunlap <rdunlap@...radead.org>,
        Thomas Gleixner <tglx@...utronix.de>,
        Michal Simek <monstr@...str.eu>, x86@...nel.org,
        linux-kernel@...r.kernel.org
Subject: [tip: core/mm] microblaze/mm/highmem: Add dropped #ifdef back

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@...utronix.de>
AuthorDate:    Thu, 19 Nov 2020 20:45:03 +01:00
Committer:     Thomas Gleixner <tglx@...utronix.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@...radead.org>
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
Cc: Michal Simek <monstr@...str.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);