diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-13 12:04:18 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-13 12:04:18 -0800 |
| commit | 25cbda46779418e5ae435707675a312c99a16dff (patch) | |
| tree | 1dbe252ac15ec4cbc5f897b1b9c5bfdab33791dc | |
| parent | 8cc8e6aaf27db47985f9e1c24ac2f7393390971e (diff) | |
| parent | ade9679c159d5bbe14fb7e59e97daf6062872e2b (diff) | |
| download | dm-user-25cbda46779418e5ae435707675a312c99a16dff.tar.gz | |
Merge branch 'akpm' (patches from Andrew)
Merge fixes from Andrew Morton:
"6 patches.
Subsystems affected by this patch series: mm/pagemap, scripts,
MAINTAINERS, and h8300"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
h8300: fix PREEMPTION build, TI_PRE_COUNT undefined
MAINTAINERS: add Andrey Konovalov to KASAN reviewers
MAINTAINERS: update Andrey Konovalov's email address
MAINTAINERS: update KASAN file list
scripts/recordmcount.pl: support big endian for ARCH sh
m68k: make __pfn_to_phys() and __phys_to_pfn() available for !MMU
| -rw-r--r-- | MAINTAINERS | 8 | ||||
| -rw-r--r-- | arch/h8300/kernel/asm-offsets.c | 3 | ||||
| -rw-r--r-- | arch/m68k/include/asm/page.h | 2 | ||||
| -rwxr-xr-x | scripts/recordmcount.pl | 6 |
4 files changed, 14 insertions, 5 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 64c7169db61760..e9fccfb27e2d34 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9561,14 +9561,16 @@ 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 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 @@ -9583,7 +9585,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 diff --git a/arch/h8300/kernel/asm-offsets.c b/arch/h8300/kernel/asm-offsets.c index 85e60509f0a839..d4b53af657c840 100644 --- a/arch/h8300/kernel/asm-offsets.c +++ b/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; } diff --git a/arch/m68k/include/asm/page.h b/arch/m68k/include/asm/page.h index 6116d7094292cf..97087dd3ca6d73 100644 --- a/arch/m68k/include/asm/page.h +++ b/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 diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl index 56c801502b9a7b..867860ea57daa4 100755 --- a/scripts/recordmcount.pl +++ b/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; |