* incoming
@ 2021-02-13 4:52 Andrew Morton
2021-02-13 4:52 ` [patch 1/6] m68k: make __pfn_to_phys() and __phys_to_pfn() available for !MMU Andrew Morton
` (5 more replies)
0 siblings, 6 replies; 7+ messages in thread
From: Andrew Morton @ 2021-02-13 4:52 UTC (permalink / raw)
To: Linus Torvalds; +Cc: mm-commits, linux-mm
6 patches, based on dcc0b49040c70ad827a7f3d58a21b01fdb14e749.
Subsystems affected by this patch series:
mm/pagemap
scripts
MAINTAINERS
h8300
Subsystem: mm/pagemap
Mike Rapoport <rppt@linux.ibm.com>:
m68k: make __pfn_to_phys() and __phys_to_pfn() available for !MMU
Subsystem: scripts
Rong Chen <rong.a.chen@intel.com>:
scripts/recordmcount.pl: support big endian for ARCH sh
Subsystem: MAINTAINERS
Andrey Konovalov <andreyknvl@google.com>:
MAINTAINERS: update KASAN file list
MAINTAINERS: update Andrey Konovalov's email address
MAINTAINERS: add Andrey Konovalov to KASAN reviewers
Subsystem: h8300
Randy Dunlap <rdunlap@infradead.org>:
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(-)
^ permalink raw reply [flat|nested] 7+ messages in thread
* [patch 1/6] m68k: make __pfn_to_phys() and __phys_to_pfn() available for !MMU
2021-02-13 4:52 incoming Andrew Morton
@ 2021-02-13 4:52 ` Andrew Morton
2021-02-13 4:52 ` [patch 2/6] scripts/recordmcount.pl: support big endian for ARCH sh Andrew Morton
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Andrew Morton @ 2021-02-13 4:52 UTC (permalink / raw)
To: akpm, geert, gerg, linux-mm, lkp, mm-commits, rppt, torvalds
From: Mike Rapoport <rppt@linux.ibm.com>
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':
>> 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.
Link: https://lkml.kernel.org/r/20210211232202.GS299309@linux.ibm.com
Fixes: 4bfc848e0981 ("m68k/mm: enable use of generic memory_model.h for !DISCONTIGMEM")
Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
Reported-by: kernel test robot <lkp@intel.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Greg Ungerer <gerg@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
arch/m68k/include/asm/page.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/arch/m68k/include/asm/page.h~m68k-make-__pfn_to_phys-and-__phys_to_pfn-available-for-mmu
+++ a/arch/m68k/include/asm/page.h
@@ -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
_
^ permalink raw reply [flat|nested] 7+ messages in thread
* [patch 2/6] scripts/recordmcount.pl: support big endian for ARCH sh
2021-02-13 4:52 incoming Andrew Morton
2021-02-13 4:52 ` [patch 1/6] m68k: make __pfn_to_phys() and __phys_to_pfn() available for !MMU Andrew Morton
@ 2021-02-13 4:52 ` Andrew Morton
2021-02-13 4:52 ` [patch 3/6] MAINTAINERS: update KASAN file list Andrew Morton
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Andrew Morton @ 2021-02-13 4:52 UTC (permalink / raw)
To: akpm, dalias, linux-mm, lkp, mm-commits, rong.a.chen, torvalds, ysato
From: Rong Chen <rong.a.chen@intel.com>
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
Link: https://lkml.kernel.org/r/20210210150435.2171567-1-rong.a.chen@intel.com
Link: https://lore.kernel.org/linux-mm/202101261118.GbbYSlHu-lkp@intel.com
Signed-off-by: Rong Chen <rong.a.chen@intel.com>
Reported-by: kernel test robot <lkp@intel.com>
Cc: Yoshinori Sato <ysato@users.osdn.me>
Cc: Rich Felker <dalias@libc.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
scripts/recordmcount.pl | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
--- a/scripts/recordmcount.pl~scripts-recordmcountpl-support-big-endian-for-arch-sh
+++ a/scripts/recordmcount.pl
@@ -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;
_
^ permalink raw reply [flat|nested] 7+ messages in thread
* [patch 3/6] MAINTAINERS: update KASAN file list
2021-02-13 4:52 incoming Andrew Morton
2021-02-13 4:52 ` [patch 1/6] m68k: make __pfn_to_phys() and __phys_to_pfn() available for !MMU Andrew Morton
2021-02-13 4:52 ` [patch 2/6] scripts/recordmcount.pl: support big endian for ARCH sh Andrew Morton
@ 2021-02-13 4:52 ` Andrew Morton
2021-02-13 4:52 ` [patch 4/6] MAINTAINERS: update Andrey Konovalov's email address Andrew Morton
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Andrew Morton @ 2021-02-13 4:52 UTC (permalink / raw)
To: akpm, andreyknvl, dvyukov, elver, glider, linux-mm, mm-commits, torvalds
From: Andrey Konovalov <andreyknvl@google.com>
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
Link: https://lkml.kernel.org/r/7f9771d97b34d396bfdc4e288ad93486bb865a06.1613150186.git.andreyknvl@google.com
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
Cc: Alexander Potapenko <glider@google.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Marco Elver <elver@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
MAINTAINERS | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--- a/MAINTAINERS~maintainers-update-kasan-file-list
+++ a/MAINTAINERS
@@ -9565,10 +9565,11 @@ R: Dmitry Vyukov <dvyukov@google.com>
L: kasan-dev@googlegroups.com
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
_
^ permalink raw reply [flat|nested] 7+ messages in thread
* [patch 4/6] MAINTAINERS: update Andrey Konovalov's email address
2021-02-13 4:52 incoming Andrew Morton
` (2 preceding siblings ...)
2021-02-13 4:52 ` [patch 3/6] MAINTAINERS: update KASAN file list Andrew Morton
@ 2021-02-13 4:52 ` Andrew Morton
2021-02-13 4:52 ` [patch 5/6] MAINTAINERS: add Andrey Konovalov to KASAN reviewers Andrew Morton
2021-02-13 4:52 ` [patch 6/6] h8300: fix PREEMPTION build, TI_PRE_COUNT undefined Andrew Morton
5 siblings, 0 replies; 7+ messages in thread
From: Andrew Morton @ 2021-02-13 4:52 UTC (permalink / raw)
To: akpm, andreyknvl, dvyukov, elver, glider, linux-mm, mm-commits, torvalds
From: Andrey Konovalov <andreyknvl@google.com>
Subject: MAINTAINERS: update Andrey Konovalov's email address
Use my personal email address.
Link: https://lkml.kernel.org/r/b0ec98dabbc12336c162788f5ccde97045a0d65e.1613150186.git.andreyknvl@google.com
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
Cc: Alexander Potapenko <glider@google.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Marco Elver <elver@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
MAINTAINERS | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/MAINTAINERS~maintainers-update-andrey-konovalovs-email-address
+++ a/MAINTAINERS
@@ -9584,7 +9584,7 @@ F: scripts/kconfig/
KCOV
R: Dmitry Vyukov <dvyukov@google.com>
-R: Andrey Konovalov <andreyknvl@google.com>
+R: Andrey Konovalov <andreyknvl@gmail.com>
L: kasan-dev@googlegroups.com
S: Maintained
F: Documentation/dev-tools/kcov.rst
_
^ permalink raw reply [flat|nested] 7+ messages in thread
* [patch 5/6] MAINTAINERS: add Andrey Konovalov to KASAN reviewers
2021-02-13 4:52 incoming Andrew Morton
` (3 preceding siblings ...)
2021-02-13 4:52 ` [patch 4/6] MAINTAINERS: update Andrey Konovalov's email address Andrew Morton
@ 2021-02-13 4:52 ` Andrew Morton
2021-02-13 4:52 ` [patch 6/6] h8300: fix PREEMPTION build, TI_PRE_COUNT undefined Andrew Morton
5 siblings, 0 replies; 7+ messages in thread
From: Andrew Morton @ 2021-02-13 4:52 UTC (permalink / raw)
To: akpm, andreyknvl, dvyukov, elver, glider, linux-mm, mm-commits, torvalds
From: Andrey Konovalov <andreyknvl@google.com>
Subject: MAINTAINERS: add Andrey Konovalov to KASAN reviewers
Add my personal email address to KASAN reviewers list.
Link: https://lkml.kernel.org/r/c1ce89a7aae0e2d6852249c280b1eb59aeac30c0.1613150186.git.andreyknvl@google.com
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
Cc: Alexander Potapenko <glider@google.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Marco Elver <elver@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
MAINTAINERS | 1 +
1 file changed, 1 insertion(+)
--- a/MAINTAINERS~maintainers-add-andrey-konovalov-to-kasan-reviewers
+++ a/MAINTAINERS
@@ -9561,6 +9561,7 @@ F: drivers/hwmon/k8temp.c
KASAN
M: Andrey Ryabinin <ryabinin.a.a@gmail.com>
R: Alexander Potapenko <glider@google.com>
+R: Andrey Konovalov <andreyknvl@gmail.com>
R: Dmitry Vyukov <dvyukov@google.com>
L: kasan-dev@googlegroups.com
S: Maintained
_
^ permalink raw reply [flat|nested] 7+ messages in thread
* [patch 6/6] h8300: fix PREEMPTION build, TI_PRE_COUNT undefined
2021-02-13 4:52 incoming Andrew Morton
` (4 preceding siblings ...)
2021-02-13 4:52 ` [patch 5/6] MAINTAINERS: add Andrey Konovalov to KASAN reviewers Andrew Morton
@ 2021-02-13 4:52 ` Andrew Morton
5 siblings, 0 replies; 7+ messages in thread
From: Andrew Morton @ 2021-02-13 4:52 UTC (permalink / raw)
To: akpm, linux-mm, lkp, mm-commits, rdunlap, tglx, torvalds, ysato
From: Randy Dunlap <rdunlap@infradead.org>
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'
Link: https://lkml.kernel.org/r/20210212021650.22740-1-rdunlap@infradead.org
Fixes: df2078b8daa7 ("h8300: Low level entry")
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Reported-by: kernel test robot <lkp@intel.com>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
arch/h8300/kernel/asm-offsets.c | 3 +++
1 file changed, 3 insertions(+)
--- a/arch/h8300/kernel/asm-offsets.c~h8300-fix-preemption-build-ti_pre_count-undefined
+++ a/arch/h8300/kernel/asm-offsets.c
@@ -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;
}
_
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-02-13 4:52 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-13 4:52 incoming Andrew Morton
2021-02-13 4:52 ` [patch 1/6] m68k: make __pfn_to_phys() and __phys_to_pfn() available for !MMU Andrew Morton
2021-02-13 4:52 ` [patch 2/6] scripts/recordmcount.pl: support big endian for ARCH sh Andrew Morton
2021-02-13 4:52 ` [patch 3/6] MAINTAINERS: update KASAN file list Andrew Morton
2021-02-13 4:52 ` [patch 4/6] MAINTAINERS: update Andrey Konovalov's email address Andrew Morton
2021-02-13 4:52 ` [patch 5/6] MAINTAINERS: add Andrey Konovalov to KASAN reviewers Andrew Morton
2021-02-13 4:52 ` [patch 6/6] h8300: fix PREEMPTION build, TI_PRE_COUNT undefined Andrew Morton
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).