Skip to content

Commit 1912b04

Browse files
torvaldstorvalds
committed
Merge branch 'akpm' (patches from Andrew)
Merge yet more updates from Andrew Morton: "Subsystems affected by this patch series: mm (memcg, migration, pagemap, gup, madvise, vmalloc), ia64, and misc" * emailed patches from Andrew Morton <[email protected]>: (31 commits) mm: remove duplicate include statement in mmu.c mm: remove the filename in the top of file comment in vmalloc.c mm: cleanup the gfp_mask handling in __vmalloc_area_node mm: remove alloc_vm_area x86/xen: open code alloc_vm_area in arch_gnttab_valloc xen/xenbus: use apply_to_page_range directly in xenbus_map_ring_pv drm/i915: use vmap in i915_gem_object_map drm/i915: stop using kmap in i915_gem_object_map drm/i915: use vmap in shmem_pin_map zsmalloc: switch from alloc_vm_area to get_vm_area mm: allow a NULL fn callback in apply_to_page_range mm: add a vmap_pfn function mm: add a VM_MAP_PUT_PAGES flag for vmap mm: update the documentation for vfree mm/madvise: introduce process_madvise() syscall: an external memory hinting API pid: move pidfd_get_pid() to pid.c mm/madvise: pass mm to do_madvise selftests/vm: 10x speedup for hmm-tests binfmt_elf: take the mmap lock around find_extend_vma() mm/gup_benchmark: take the mmap lock around GUP ...
2 parents 9453b2d + c922781 commit 1912b04

File tree

55 files changed

+592
-439
lines changed

Some content is hidden

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

55 files changed

+592
-439
lines changed

‎arch/alpha/kernel/syscalls/syscall.tbl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -479,3 +479,4 @@
479479
547 common openat2 sys_openat2
480480
548 common pidfd_getfd sys_pidfd_getfd
481481
549 common faccessat2 sys_faccessat2
482+
550 common process_madvise sys_process_madvise

‎arch/arm/mm/mmu.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
#include <asm/cp15.h>
1919
#include <asm/cputype.h>
20-
#include <asm/sections.h>
2120
#include <asm/cachetype.h>
2221
#include <asm/fixmap.h>
2322
#include <asm/sections.h>

‎arch/arm/tools/syscall.tbl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -453,3 +453,4 @@
453453
437 common openat2 sys_openat2
454454
438 common pidfd_getfd sys_pidfd_getfd
455455
439 common faccessat2 sys_faccessat2
456+
440 common process_madvise sys_process_madvise

‎arch/arm64/include/asm/unistd.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
#define __ARM_NR_compat_set_tls (__ARM_NR_COMPAT_BASE + 5)
3939
#define __ARM_NR_COMPAT_END (__ARM_NR_COMPAT_BASE + 0x800)
4040

41-
#define __NR_compat_syscalls 440
41+
#define __NR_compat_syscalls 441
4242
#endif
4343

4444
#define __ARCH_WANT_SYS_CLONE

‎arch/arm64/include/asm/unistd32.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -887,6 +887,8 @@ __SYSCALL(__NR_openat2, sys_openat2)
887887
__SYSCALL(__NR_pidfd_getfd, sys_pidfd_getfd)
888888
#define __NR_faccessat2 439
889889
__SYSCALL(__NR_faccessat2, sys_faccessat2)
890+
#define __NR_process_madvise 440
891+
__SYSCALL(__NR_process_madvise, sys_process_madvise)
890892

891893
/*
892894
* Please add new compat syscalls above this comment and update

‎arch/ia64/kernel/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ obj-y += esi_stub.o # must be in kernel proper
4040
endif
4141
obj-$(CONFIG_INTEL_IOMMU) += pci-dma.o
4242

43-
obj-$(CONFIG_BINFMT_ELF) += elfcore.o
43+
obj-$(CONFIG_ELF_CORE) += elfcore.o
4444

4545
# fp_emulate() expects f2-f5,f16-f31 to contain the user-level state.
4646
CFLAGS_traps.o += -mfixed-range=f2-f5,f16-f31

‎arch/ia64/kernel/syscalls/syscall.tbl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -360,3 +360,4 @@
360360
437 common openat2 sys_openat2
361361
438 common pidfd_getfd sys_pidfd_getfd
362362
439 common faccessat2 sys_faccessat2
363+
440 common process_madvise sys_process_madvise

‎arch/m68k/kernel/syscalls/syscall.tbl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -439,3 +439,4 @@
439439
437 common openat2 sys_openat2
440440
438 common pidfd_getfd sys_pidfd_getfd
441441
439 common faccessat2 sys_faccessat2
442+
440 common process_madvise sys_process_madvise

‎arch/microblaze/kernel/syscalls/syscall.tbl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -445,3 +445,4 @@
445445
437 common openat2 sys_openat2
446446
438 common pidfd_getfd sys_pidfd_getfd
447447
439 common faccessat2 sys_faccessat2
448+
440 common process_madvise sys_process_madvise

‎arch/mips/kernel/syscalls/syscall_n32.tbl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -378,3 +378,4 @@
378378
437 n32 openat2 sys_openat2
379379
438 n32 pidfd_getfd sys_pidfd_getfd
380380
439 n32 faccessat2 sys_faccessat2
381+
440 n32 process_madvise sys_process_madvise

0 commit comments

Comments
 (0)