Skip to contentSkip to conversation

incoming

PATCH New Andrew Morton 1 participant 7 messages Feb 13, 2021

Subsystems (2)
lore
Share & tools
lore

Andrew Morton

author maintainer
#0 lore raw

6 patches, based on dcc0b49040c70ad827a7f3d58a21b01fdb14e749.

Subsystems affected by this patch series:

mm/pagemap
scripts
MAINTAINERS
h8300

Subsystem: mm/pagemap

Mike Rapoport <[email protected]>:
m68k: make __pfn_to_phys() and __phys_to_pfn() available for !MMU

Subsystem: scripts

Rong Chen <[email protected]>:
scripts/recordmcount.pl: support big endian for ARCH sh

Subsystem: MAINTAINERS

Andrey Konovalov <[email protected]>:
MAINTAINERS: update KASAN file list
MAINTAINERS: update Andrey Konovalov's email address
MAINTAINERS: add Andrey Konovalov to KASAN reviewers

Subsystem: h8300

Randy Dunlap <[email protected]>:
h8300: fix PREEMPTION build, TI_PRE_COUNT undefined

 MAINTAINERS                     |    8 +++++---
 arch/h8300/kernel/asm-offsets.c |    3 +++
 arch/m68k/include/asm/page.h    |    2 +-
 scripts/recordmcount.pl         |    6 +++++-
 4 files changed, 14 insertions(+), 5 deletions(-)
author maintainer
#1 lore raw

PATCH 1/6 m68k: make __pfn_to_phys() and __phys_to_pfn() available for !MMU

From: Mike Rapoport <[email protected]>
Subject: m68k: make __pfn_to_phys() and __phys_to_pfn() available for !MMU

Recent changes that obsoleted DISCONTIGMEM on m68k switched the MMU variant to use generic definitions of __pfn_to_phys() and __phys_to_pfn(), but missed the !MMU variant which caused a build failure:

All errors (new ones prefixed by >>):

drivers/media/common/videobuf2/videobuf2-dma-contig.c: In function 'vb2_dc_get_userptr':

Quoted 1 line
Quoted 1 line

drivers/media/common/videobuf2/videobuf2-dma-contig.c:509:5: error: implicit declaration of function '__pfn_to_phys' [-Werror=implicit-function-declaration]

     509 |     __pfn_to_phys(nums[0]), size, buf->dma_dir, 0);
         |     ^~~~~~~~~~~~~

cc1: some warnings being treated as errors

Enable __pfn_to_phys() and __phys_to_pfn() on !MMU builds.

Fixes 4bfc848e0981 ("m68k/mm: enable use of generic memory_model.h for !DISCONTIGMEM")
Cc Geert Uytterhoeven <[email protected]>
Cc Greg Ungerer <[email protected]>

---

 arch/m68k/include/asm/page.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/m68k/include/asm/page.h renamed from arch/m68k/include/asm/page.h~m68k-make-__pfn_to_phys-and-__phys_to_pfn-available-for-mmu +1 -1
@@ -62,7 +62,7 @@ extern unsigned long _ramend;
 #include <asm/page_no.h>
 #endif
 
-#ifdef CONFIG_DISCONTIGMEM
+#if !defined(CONFIG_MMU) || defined(CONFIG_DISCONTIGMEM)
 #define __phys_to_pfn(paddr)	((unsigned long)((paddr) >> PAGE_SHIFT))
 #define __pfn_to_phys(pfn)	PFN_PHYS(pfn)
 #endif

_

author maintainer
#2 lore raw

PATCH 2/6 scripts/recordmcount.pl: support big endian for ARCH sh

In reply to Andrew Morton

From: Rong Chen <[email protected]>
Subject: scripts/recordmcount.pl: support big endian for ARCH sh

The kernel test robot reported the following issue:
CC [M] drivers/soc/litex/litex_soc_ctrl.o
sh4-linux-objcopy: Unable to change endianness of input file(s)
sh4-linux-ld: cannot find drivers/soc/litex/.tmp_gl_litex_soc_ctrl.o: No such file or directory
sh4-linux-objcopy: 'drivers/soc/litex/.tmp_mx_litex_soc_ctrl.o': No such file

The problem is that the format of input file is elf32-shbig-linux, but sh4-linux-objcopy wants to output a file which format is elf32-sh-linux:

  $ sh4-linux-objdump -d drivers/soc/litex/litex_soc_ctrl.o | grep format
  drivers/soc/litex/litex_soc_ctrl.o:     file format elf32-shbig-linux

---

 scripts/recordmcount.pl |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
scripts/recordmcount.pl renamed from scripts/recordmcount.pl~scripts-recordmcountpl-support-big-endian-for-arch-sh +5 -1
@@ -265,7 +265,11 @@ if ($arch eq "x86_64") {
 
     # force flags for this arch
     $ld .= " -m shlelf_linux";
-    $objcopy .= " -O elf32-sh-linux";
+    if ($endian eq "big") {
+        $objcopy .= " -O elf32-shbig-linux";
+    } else {
+        $objcopy .= " -O elf32-sh-linux";
+    }
 
 } elsif ($arch eq "powerpc") {
     my $ldemulation;

_

author maintainer
#3 lore raw

PATCH 3/6 MAINTAINERS: update KASAN file list

In reply to Andrew Morton

From: Andrey Konovalov <[email protected]>
Subject: MAINTAINERS: update KASAN file list

Account for the following files:

- lib/Kconfig.kasan
- lib/test_kasan_module.c
- arch/arm64/include/asm/mte-kasan.h

---

 MAINTAINERS |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
MAINTAINERS renamed from MAINTAINERS~maintainers-update-kasan-file-list +3 -2
@@ -9565,10 +9565,11 @@ R:	Dmitry Vyukov <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	Documentation/dev-tools/kasan.rst
-F:	arch/*/include/asm/kasan.h
+F:	arch/*/include/asm/*kasan.h
 F:	arch/*/mm/kasan_init*
 F:	include/linux/kasan*.h
-F:	lib/test_kasan.c
+F:	lib/Kconfig.kasan
+F:	lib/test_kasan*.c
 F:	mm/kasan/
 F:	scripts/Makefile.kasan
 

_

author maintainer
#4 lore raw

PATCH 4/6 MAINTAINERS: update Andrey Konovalov's email address

In reply to Andrew Morton

From: Andrey Konovalov <[email protected]>
Subject: MAINTAINERS: update Andrey Konovalov's email address

Use my personal email address.

---

 MAINTAINERS |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
MAINTAINERS renamed from MAINTAINERS~maintainers-update-andrey-konovalovs-email-address +1 -1
@@ -9584,7 +9584,7 @@ F:	scripts/kconfig/
 
 KCOV
 R:	Dmitry Vyukov <[email protected]>
-R:	Andrey Konovalov <[email protected]>
+R:	Andrey Konovalov <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	Documentation/dev-tools/kcov.rst

_

author maintainer
#5 lore raw

PATCH 5/6 MAINTAINERS: add Andrey Konovalov to KASAN reviewers

In reply to Andrew Morton

From: Andrey Konovalov <[email protected]>
Subject: MAINTAINERS: add Andrey Konovalov to KASAN reviewers

Add my personal email address to KASAN reviewers list.

---

 MAINTAINERS |    1 +
 1 file changed, 1 insertion(+)
MAINTAINERS renamed from MAINTAINERS~maintainers-add-andrey-konovalov-to-kasan-reviewers +1 -0
@@ -9561,6 +9561,7 @@ F:	drivers/hwmon/k8temp.c
 KASAN
 M:	Andrey Ryabinin <[email protected]>
 R:	Alexander Potapenko <[email protected]>
+R:	Andrey Konovalov <[email protected]>
 R:	Dmitry Vyukov <[email protected]>
 L:	[email protected]
 S:	Maintained

_

author maintainer
#6 lore raw

PATCH 6/6 h8300: fix PREEMPTION build, TI_PRE_COUNT undefined

In reply to Andrew Morton

From: Randy Dunlap <[email protected]>
Subject: h8300: fix PREEMPTION build, TI_PRE_COUNT undefined

Fix a build error for undefined 'TI_PRE_COUNT' by adding it to asm-offsets.c.

h8300-linux-ld: arch/h8300/kernel/entry.o: in function `resume_kernel':
(.text+0x29a): undefined reference to `TI_PRE_COUNT'

Fixes df2078b8daa7 ("h8300: Low level entry")
Cc Yoshinori Sato <[email protected]>
Cc Thomas Gleixner <[email protected]>

---

 arch/h8300/kernel/asm-offsets.c |    3 +++
 1 file changed, 3 insertions(+)
arch/h8300/kernel/asm-offsets.c renamed from arch/h8300/kernel/asm-offsets.c~h8300-fix-preemption-build-ti_pre_count-undefined +3 -0
@@ -63,6 +63,9 @@ int main(void)
 	OFFSET(TI_FLAGS, thread_info, flags);
 	OFFSET(TI_CPU, thread_info, cpu);
 	OFFSET(TI_PRE, thread_info, preempt_count);
+#ifdef CONFIG_PREEMPTION
+	DEFINE(TI_PRE_COUNT, offsetof(struct thread_info, preempt_count));
+#endif
 
 	return 0;
 }

_