[Buildroot] [PATCH 1/1] linux: fix CIP RT kernel on microblaze

* [Buildroot] [PATCH 1/1] linux: fix CIP RT kernel on microblaze
@ 2023-02-25 17:02 Fabrice Fontaine
  2023-02-26 17:43 ` Thomas Petazzoni via buildroot
  0 siblings, 1 reply; 2+ messages in thread
From: Fabrice Fontaine @ 2023-02-25 17:02 UTC (permalink / raw)
  To: buildroot; +Cc: Fabrice Fontaine

Fix the following build failure with CIP RT kernel on microblaze raised
since bump to version 5.10.83-cip1-rt1 in commit
b5778d7b76c098010a4abc339938f2694e8cf57f and
https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/commit/?id=32ac92b5a39e2ef91308929bf5ed0804094b4183:

arch/microblaze/mm/init.c:71:2: error: #endif without #if
   71 | #endif /* CONFIG_HIGHMEM */
      |  ^~~~~

Fixes:
 - http://autobuild.buildroot.org/results/27291870cf7539d26e45c45f34322d24a6dbca33

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 ...-arch-microblaze-mm-init.c-fix-build.patch | 37 +++++++++++++++++++
 linux/linux.mk                                |  3 +-
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 linux/cip-rt/0001-arch-microblaze-mm-init.c-fix-build.patch

diff --git a/linux/cip-rt/0001-arch-microblaze-mm-init.c-fix-build.patch b/linux/cip-rt/0001-arch-microblaze-mm-init.c-fix-build.patch
new file mode 100644
index 0000000000..4760d9e4fb
--- /dev/null
+++ b/linux/cip-rt/0001-arch-microblaze-mm-init.c-fix-build.patch
@@ -0,0 +1,37 @@
+From 1fc03e1fdc8bb606d1c95e9fa557a9e5f6df17ec Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Sat, 25 Feb 2023 17:26:56 +0100
+Subject: [PATCH] arch/microblaze/mm/init.c: fix build
+
+Fix the following build failure on microblaze raised since
+https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/commit/arch/microblaze/mm/init.c?h=v5.10.168-cip27-rt11&id=32ac92b5a39e2ef91308929bf5ed0804094b4183:
+
+arch/microblaze/mm/init.c:71:2: error: #endif without #if
+   71 | #endif /* CONFIG_HIGHMEM */
+      |  ^~~~~
+
+Fixes:
+ - http://autobuild.buildroot.org/results/27291870cf7539d26e45c45f34322d24a6dbca33
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Upstream status: sent to
+Sebastian Andrzej Siewior <bigeasy@linutronix.de>]
+---
+ 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 1f4b5b34e600..a444778e59de 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);
+-- 
+2.39.1
+
diff --git a/linux/linux.mk b/linux/linux.mk
index 7645b5f507..f3fdc40328 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -33,6 +33,7 @@ LINUX_SITE_METHOD = svn
 else ifeq ($(BR2_LINUX_KERNEL_LATEST_CIP_VERSION)$(BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION),y)
 LINUX_SOURCE = linux-cip-$(LINUX_VERSION).tar.gz
 LINUX_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/snapshot
+LINUX_PATCHES += linux/cip-rt/0001-arch-microblaze-mm-init.c-fix-build.patch
 else ifneq ($(findstring -rc,$(LINUX_VERSION)),)
 # Since 4.12-rc1, -rc kernels are generated from cgit. This also works for
 # older -rc kernels.
@@ -50,7 +51,7 @@ ifeq ($(BR2_LINUX_KERNEL)$(BR2_LINUX_KERNEL_LATEST_VERSION),y)
 BR_NO_CHECK_HASH_FOR += $(LINUX_SOURCE)
 endif
 
-LINUX_PATCHES = $(call qstrip,$(BR2_LINUX_KERNEL_PATCH))
+LINUX_PATCHES += $(call qstrip,$(BR2_LINUX_KERNEL_PATCH))
 
 # We have no way to know the hashes for user-supplied patches.
 BR_NO_CHECK_HASH_FOR += $(notdir $(LINUX_PATCHES))
-- 
2.39.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 2+ messages in thread