Commit 25cbda46 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 8cc8e6aa ade9679c

MAINTAINERS

+5 −3
Original line number Diff line number Diff line
@@ -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
































arch/h8300/kernel/asm-offsets.c



+3
−0






























Original line number
Diff line number
Diff line







@@ -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;









}
























arch/m68k/include/asm/page.h



+1
−1






























Original line number
Diff line number
Diff line







@@ -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
































scripts/recordmcount.pl



+5
−1






























Original line number
Diff line number
Diff line







@@ -265,7 +265,11 @@ if ($arch eq "x86_64") {

















    # force flags for this arch









    $ld .= " -m shlelf_linux";









    if ($endian eq "big") {









        $objcopy .= " -O elf32-shbig-linux";









    } else {









        $objcopy .= " -O elf32-sh-linux";









    }



















} elsif ($arch eq "powerpc") {









    my $ldemulation;