Skip to content

Commit 139711f

Browse files
committed
Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton: "16 patches Subsystems affected by this patch series: mm (selftests, hugetlb, pagecache, mremap, kasan, and slub), kbuild, checkpatch, misc, and lib" * emailed patches from Andrew Morton <[email protected]>: mm: slub: call account_slab_page() after slab page initialization zlib: move EXPORT_SYMBOL() and MODULE_LICENSE() out of dfltcc_syms.c lib/zlib: fix inflating zlib streams on s390 lib/genalloc: fix the overflow when size is too big kdev_t: always inline major/minor helper functions sizes.h: add SZ_8G/SZ_16G/SZ_32G macros local64.h: make <asm/local64.h> mandatory kasan: fix null pointer dereference in kasan_record_aux_stack mm: generalise COW SMC TLB flushing race comment mm/mremap.c: fix extent calculation mm: memmap defer init doesn't work as expected mm: add prototype for __add_to_page_cache_locked() checkpatch: prefer strscpy to strlcpy Revert "kbuild: avoid static_assert for genksyms" mm/hugetlb: fix deadlock in hugetlb_cow error path selftests/vm: fix building protection keys test
2 parents dea8dcf + 1f3147b commit 139711f

File tree

42 files changed

+101
-91
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+101
-91
lines changed

arch/alpha/include/asm/local64.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

arch/arc/include/asm/Kbuild

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# SPDX-License-Identifier: GPL-2.0
22
generic-y += extable.h
33
generic-y += kvm_para.h
4-
generic-y += local64.h
54
generic-y += mcs_spinlock.h
65
generic-y += parport.h
76
generic-y += user.h

arch/arm/include/asm/Kbuild

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
generic-y += early_ioremap.h
33
generic-y += extable.h
44
generic-y += flat.h
5-
generic-y += local64.h
65
generic-y += parport.h
76

87
generated-y += mach-types.h

arch/arm64/include/asm/Kbuild

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# SPDX-License-Identifier: GPL-2.0
22
generic-y += early_ioremap.h
3-
generic-y += local64.h
43
generic-y += mcs_spinlock.h
54
generic-y += qrwlock.h
65
generic-y += qspinlock.h

arch/csky/include/asm/Kbuild

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
generic-y += asm-offsets.h
33
generic-y += gpio.h
44
generic-y += kvm_para.h
5-
generic-y += local64.h
65
generic-y += qrwlock.h
76
generic-y += user.h
87
generic-y += vmlinux.lds.h

arch/h8300/include/asm/Kbuild

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
generic-y += asm-offsets.h
33
generic-y += extable.h
44
generic-y += kvm_para.h
5-
generic-y += local64.h
65
generic-y += mcs_spinlock.h
76
generic-y += parport.h
87
generic-y += spinlock.h

arch/hexagon/include/asm/Kbuild

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@
22
generic-y += extable.h
33
generic-y += iomap.h
44
generic-y += kvm_para.h
5-
generic-y += local64.h
65
generic-y += mcs_spinlock.h

arch/ia64/include/asm/local64.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

arch/ia64/mm/init.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@ virtual_memmap_init(u64 start, u64 end, void *arg)
536536

537537
if (map_start < map_end)
538538
memmap_init_zone((unsigned long)(map_end - map_start),
539-
args->nid, args->zone, page_to_pfn(map_start),
539+
args->nid, args->zone, page_to_pfn(map_start), page_to_pfn(map_end),
540540
MEMINIT_EARLY, NULL, MIGRATE_MOVABLE);
541541
return 0;
542542
}
@@ -546,7 +546,7 @@ memmap_init (unsigned long size, int nid, unsigned long zone,
546546
unsigned long start_pfn)
547547
{
548548
if (!vmem_map) {
549-
memmap_init_zone(size, nid, zone, start_pfn,
549+
memmap_init_zone(size, nid, zone, start_pfn, start_pfn + size,
550550
MEMINIT_EARLY, NULL, MIGRATE_MOVABLE);
551551
} else {
552552
struct page *start;

arch/m68k/include/asm/Kbuild

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@
22
generated-y += syscall_table.h
33
generic-y += extable.h
44
generic-y += kvm_para.h
5-
generic-y += local64.h
65
generic-y += mcs_spinlock.h
76
generic-y += spinlock.h

0 commit comments

Comments
 (0)