Skip to content

Commit 3541833

Browse files
torvaldstorvalds
committed
Merge tag 's390-4.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Martin Schwidefsky: - A fix for the pgtable_bytes misaccounting on s390. The patch changes common code part in regard to page table folding and adds extra checks to mm_[inc|dec]_nr_[pmds|puds]. - Add FORCE for all build targets using if_changed - Use non-loadable phdr for the .vmlinux.info section to avoid a segment overlap that confuses kexec - Cleanup the attribute definition for the diagnostic sampling - Increase stack size for CONFIG_KASAN=y builds - Export __node_distance to fix a build error - Correct return code of a PMU event init function - An update for the default configs * tag 's390-4.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: s390/perf: Change CPUM_CF return code in event init function s390: update defconfigs s390/mm: Fix ERROR: "__node_distance" undefined! s390/kasan: increase instrumented stack size to 64k s390/cpum_sf: Rework attribute definition for diagnostic sampling s390/mm: fix mis-accounting of pgtable_bytes mm: add mm_pxd_folded checks to pgtable_bytes accounting functions mm: introduce mm_[p4d|pud|pmd]_folded mm: make the __PAGETABLE_PxD_FOLDED defines non-empty s390: avoid vmlinux segments overlap s390/vdso: add missing FORCE to build targets s390/decompressor: add missing FORCE to build targets
2 parents 24ccea7 + 0bb2ae1 commit 3541833

File tree

31 files changed

+175
-93
lines changed

31 files changed

+175
-93
lines changed

‎arch/arm/include/asm/pgtable-2level.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#ifndef _ASM_PGTABLE_2LEVEL_H
1111
#define _ASM_PGTABLE_2LEVEL_H
1212

13-
#define __PAGETABLE_PMD_FOLDED
13+
#define __PAGETABLE_PMD_FOLDED 1
1414

1515
/*
1616
* Hardware-wise, we have a two level page table structure, where the first

‎arch/m68k/include/asm/pgtable_mm.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@
5555
*/
5656
#ifdef CONFIG_SUN3
5757
#define PTRS_PER_PTE 16
58-
#define __PAGETABLE_PMD_FOLDED
58+
#define __PAGETABLE_PMD_FOLDED 1
5959
#define PTRS_PER_PMD 1
6060
#define PTRS_PER_PGD 2048
6161
#elif defined(CONFIG_COLDFIRE)
6262
#define PTRS_PER_PTE 512
63-
#define __PAGETABLE_PMD_FOLDED
63+
#define __PAGETABLE_PMD_FOLDED 1
6464
#define PTRS_PER_PMD 1
6565
#define PTRS_PER_PGD 1024
6666
#else

‎arch/microblaze/include/asm/pgtable.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ extern int mem_init_done;
6363

6464
#include <asm-generic/4level-fixup.h>
6565

66-
#define __PAGETABLE_PMD_FOLDED
66+
#define __PAGETABLE_PMD_FOLDED 1
6767

6868
#ifdef __KERNEL__
6969
#ifndef __ASSEMBLY__

‎arch/nds32/include/asm/pgtable.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#ifndef _ASMNDS32_PGTABLE_H
55
#define _ASMNDS32_PGTABLE_H
66

7-
#define __PAGETABLE_PMD_FOLDED
7+
#define __PAGETABLE_PMD_FOLDED 1
88
#include <asm-generic/4level-fixup.h>
99
#include <asm-generic/sizes.h>
1010

‎arch/parisc/include/asm/pgtable.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ static inline void purge_tlb_entries(struct mm_struct *mm, unsigned long addr)
111111
#if CONFIG_PGTABLE_LEVELS == 3
112112
#define BITS_PER_PMD (PAGE_SHIFT + PMD_ORDER - BITS_PER_PMD_ENTRY)
113113
#else
114-
#define __PAGETABLE_PMD_FOLDED
114+
#define __PAGETABLE_PMD_FOLDED 1
115115
#define BITS_PER_PMD 0
116116
#endif
117117
#define PTRS_PER_PMD (1UL << BITS_PER_PMD)

‎arch/s390/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ KBUILD_CFLAGS_DECOMPRESSOR += $(call cc-option,-ffreestanding)
2727
KBUILD_CFLAGS_DECOMPRESSOR += $(if $(CONFIG_DEBUG_INFO),-g)
2828
KBUILD_CFLAGS_DECOMPRESSOR += $(if $(CONFIG_DEBUG_INFO_DWARF4), $(call cc-option, -gdwarf-4,))
2929
UTS_MACHINE := s390x
30-
STACK_SIZE := $(if $(CONFIG_KASAN),32768,16384)
30+
STACK_SIZE := $(if $(CONFIG_KASAN),65536,16384)
3131
CHECKFLAGS += -D__s390__ -D__s390x__
3232

3333
export LD_BFD

‎arch/s390/boot/compressed/Makefile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ OBJCOPYFLAGS :=
2222
OBJECTS := $(addprefix $(obj)/,$(obj-y))
2323

2424
LDFLAGS_vmlinux := --oformat $(LD_BFD) -e startup -T
25-
$(obj)/vmlinux: $(obj)/vmlinux.lds $(objtree)/arch/s390/boot/startup.a $(OBJECTS)
25+
$(obj)/vmlinux: $(obj)/vmlinux.lds $(objtree)/arch/s390/boot/startup.a $(OBJECTS) FORCE
2626
$(call if_changed,ld)
2727

28-
OBJCOPYFLAGS_info.bin := -O binary --only-section=.vmlinux.info
28+
OBJCOPYFLAGS_info.bin := -O binary --only-section=.vmlinux.info --set-section-flags .vmlinux.info=load
2929
$(obj)/info.bin: vmlinux FORCE
3030
$(call if_changed,objcopy)
3131

@@ -46,17 +46,17 @@ suffix-$(CONFIG_KERNEL_LZMA) := .lzma
4646
suffix-$(CONFIG_KERNEL_LZO) := .lzo
4747
suffix-$(CONFIG_KERNEL_XZ) := .xz
4848

49-
$(obj)/vmlinux.bin.gz: $(vmlinux.bin.all-y)
49+
$(obj)/vmlinux.bin.gz: $(vmlinux.bin.all-y) FORCE
5050
$(call if_changed,gzip)
51-
$(obj)/vmlinux.bin.bz2: $(vmlinux.bin.all-y)
51+
$(obj)/vmlinux.bin.bz2: $(vmlinux.bin.all-y) FORCE
5252
$(call if_changed,bzip2)
53-
$(obj)/vmlinux.bin.lz4: $(vmlinux.bin.all-y)
53+
$(obj)/vmlinux.bin.lz4: $(vmlinux.bin.all-y) FORCE
5454
$(call if_changed,lz4)
55-
$(obj)/vmlinux.bin.lzma: $(vmlinux.bin.all-y)
55+
$(obj)/vmlinux.bin.lzma: $(vmlinux.bin.all-y) FORCE
5656
$(call if_changed,lzma)
57-
$(obj)/vmlinux.bin.lzo: $(vmlinux.bin.all-y)
57+
$(obj)/vmlinux.bin.lzo: $(vmlinux.bin.all-y) FORCE
5858
$(call if_changed,lzo)
59-
$(obj)/vmlinux.bin.xz: $(vmlinux.bin.all-y)
59+
$(obj)/vmlinux.bin.xz: $(vmlinux.bin.all-y) FORCE
6060
$(call if_changed,xzkern)
6161

6262
OBJCOPYFLAGS_piggy.o := -I binary -O elf64-s390 -B s390:64-bit --rename-section .data=.vmlinux.bin.compressed

‎arch/s390/configs/debug_defconfig

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ CONFIG_NUMA=y
6464
CONFIG_PREEMPT=y
6565
CONFIG_HZ_100=y
6666
CONFIG_KEXEC_FILE=y
67+
CONFIG_EXPOLINE=y
68+
CONFIG_EXPOLINE_AUTO=y
6769
CONFIG_MEMORY_HOTPLUG=y
6870
CONFIG_MEMORY_HOTREMOVE=y
6971
CONFIG_KSM=y
@@ -84,9 +86,11 @@ CONFIG_PCI_DEBUG=y
8486
CONFIG_HOTPLUG_PCI=y
8587
CONFIG_HOTPLUG_PCI_S390=y
8688
CONFIG_CHSC_SCH=y
89+
CONFIG_VFIO_AP=m
8790
CONFIG_CRASH_DUMP=y
8891
CONFIG_BINFMT_MISC=m
8992
CONFIG_HIBERNATION=y
93+
CONFIG_PM_DEBUG=y
9094
CONFIG_NET=y
9195
CONFIG_PACKET=y
9296
CONFIG_PACKET_DIAG=m
@@ -161,8 +165,6 @@ CONFIG_NF_CONNTRACK_TFTP=m
161165
CONFIG_NF_CT_NETLINK=m
162166
CONFIG_NF_CT_NETLINK_TIMEOUT=m
163167
CONFIG_NF_TABLES=m
164-
CONFIG_NFT_EXTHDR=m
165-
CONFIG_NFT_META=m
166168
CONFIG_NFT_CT=m
167169
CONFIG_NFT_COUNTER=m
168170
CONFIG_NFT_LOG=m
@@ -365,6 +367,8 @@ CONFIG_NET_ACT_SKBEDIT=m
365367
CONFIG_NET_ACT_CSUM=m
366368
CONFIG_DNS_RESOLVER=y
367369
CONFIG_OPENVSWITCH=m
370+
CONFIG_VSOCKETS=m
371+
CONFIG_VIRTIO_VSOCKETS=m
368372
CONFIG_NETLINK_DIAG=m
369373
CONFIG_CGROUP_NET_PRIO=y
370374
CONFIG_BPF_JIT=y
@@ -461,6 +465,7 @@ CONFIG_PPTP=m
461465
CONFIG_PPPOL2TP=m
462466
CONFIG_PPP_ASYNC=m
463467
CONFIG_PPP_SYNC_TTY=m
468+
CONFIG_ISM=m
464469
CONFIG_INPUT_EVDEV=y
465470
# CONFIG_INPUT_KEYBOARD is not set
466471
# CONFIG_INPUT_MOUSE is not set
@@ -486,9 +491,12 @@ CONFIG_MLX4_INFINIBAND=m
486491
CONFIG_MLX5_INFINIBAND=m
487492
CONFIG_VFIO=m
488493
CONFIG_VFIO_PCI=m
494+
CONFIG_VFIO_MDEV=m
495+
CONFIG_VFIO_MDEV_DEVICE=m
489496
CONFIG_VIRTIO_PCI=m
490497
CONFIG_VIRTIO_BALLOON=m
491498
CONFIG_VIRTIO_INPUT=y
499+
CONFIG_S390_AP_IOMMU=y
492500
CONFIG_EXT4_FS=y
493501
CONFIG_EXT4_FS_POSIX_ACL=y
494502
CONFIG_EXT4_FS_SECURITY=y
@@ -615,7 +623,6 @@ CONFIG_DEBUG_CREDENTIALS=y
615623
CONFIG_RCU_TORTURE_TEST=m
616624
CONFIG_RCU_CPU_STALL_TIMEOUT=300
617625
CONFIG_NOTIFIER_ERROR_INJECTION=m
618-
CONFIG_PM_NOTIFIER_ERROR_INJECT=m
619626
CONFIG_NETDEV_NOTIFIER_ERROR_INJECT=m
620627
CONFIG_FAULT_INJECTION=y
621628
CONFIG_FAILSLAB=y
@@ -727,3 +734,4 @@ CONFIG_APPLDATA_BASE=y
727734
CONFIG_KVM=m
728735
CONFIG_KVM_S390_UCONTROL=y
729736
CONFIG_VHOST_NET=m
737+
CONFIG_VHOST_VSOCK=m

‎arch/s390/configs/performance_defconfig

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ CONFIG_NR_CPUS=512
6565
CONFIG_NUMA=y
6666
CONFIG_HZ_100=y
6767
CONFIG_KEXEC_FILE=y
68+
CONFIG_EXPOLINE=y
69+
CONFIG_EXPOLINE_AUTO=y
6870
CONFIG_MEMORY_HOTPLUG=y
6971
CONFIG_MEMORY_HOTREMOVE=y
7072
CONFIG_KSM=y
@@ -82,9 +84,11 @@ CONFIG_PCI=y
8284
CONFIG_HOTPLUG_PCI=y
8385
CONFIG_HOTPLUG_PCI_S390=y
8486
CONFIG_CHSC_SCH=y
87+
CONFIG_VFIO_AP=m
8588
CONFIG_CRASH_DUMP=y
8689
CONFIG_BINFMT_MISC=m
8790
CONFIG_HIBERNATION=y
91+
CONFIG_PM_DEBUG=y
8892
CONFIG_NET=y
8993
CONFIG_PACKET=y
9094
CONFIG_PACKET_DIAG=m
@@ -159,8 +163,6 @@ CONFIG_NF_CONNTRACK_TFTP=m
159163
CONFIG_NF_CT_NETLINK=m
160164
CONFIG_NF_CT_NETLINK_TIMEOUT=m
161165
CONFIG_NF_TABLES=m
162-
CONFIG_NFT_EXTHDR=m
163-
CONFIG_NFT_META=m
164166
CONFIG_NFT_CT=m
165167
CONFIG_NFT_COUNTER=m
166168
CONFIG_NFT_LOG=m
@@ -362,6 +364,8 @@ CONFIG_NET_ACT_SKBEDIT=m
362364
CONFIG_NET_ACT_CSUM=m
363365
CONFIG_DNS_RESOLVER=y
364366
CONFIG_OPENVSWITCH=m
367+
CONFIG_VSOCKETS=m
368+
CONFIG_VIRTIO_VSOCKETS=m
365369
CONFIG_NETLINK_DIAG=m
366370
CONFIG_CGROUP_NET_PRIO=y
367371
CONFIG_BPF_JIT=y
@@ -458,6 +462,7 @@ CONFIG_PPTP=m
458462
CONFIG_PPPOL2TP=m
459463
CONFIG_PPP_ASYNC=m
460464
CONFIG_PPP_SYNC_TTY=m
465+
CONFIG_ISM=m
461466
CONFIG_INPUT_EVDEV=y
462467
# CONFIG_INPUT_KEYBOARD is not set
463468
# CONFIG_INPUT_MOUSE is not set
@@ -483,9 +488,12 @@ CONFIG_MLX4_INFINIBAND=m
483488
CONFIG_MLX5_INFINIBAND=m
484489
CONFIG_VFIO=m
485490
CONFIG_VFIO_PCI=m
491+
CONFIG_VFIO_MDEV=m
492+
CONFIG_VFIO_MDEV_DEVICE=m
486493
CONFIG_VIRTIO_PCI=m
487494
CONFIG_VIRTIO_BALLOON=m
488495
CONFIG_VIRTIO_INPUT=y
496+
CONFIG_S390_AP_IOMMU=y
489497
CONFIG_EXT4_FS=y
490498
CONFIG_EXT4_FS_POSIX_ACL=y
491499
CONFIG_EXT4_FS_SECURITY=y
@@ -666,3 +674,4 @@ CONFIG_APPLDATA_BASE=y
666674
CONFIG_KVM=m
667675
CONFIG_KVM_S390_UCONTROL=y
668676
CONFIG_VHOST_NET=m
677+
CONFIG_VHOST_VSOCK=m

‎arch/s390/defconfig

Lines changed: 41 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,23 @@ CONFIG_CGROUP_CPUACCT=y
2626
CONFIG_CGROUP_PERF=y
2727
CONFIG_NAMESPACES=y
2828
CONFIG_USER_NS=y
29+
CONFIG_CHECKPOINT_RESTORE=y
2930
CONFIG_BLK_DEV_INITRD=y
3031
CONFIG_EXPERT=y
3132
# CONFIG_SYSFS_SYSCALL is not set
32-
CONFIG_CHECKPOINT_RESTORE=y
3333
CONFIG_BPF_SYSCALL=y
3434
CONFIG_USERFAULTFD=y
3535
# CONFIG_COMPAT_BRK is not set
3636
CONFIG_PROFILING=y
37+
CONFIG_LIVEPATCH=y
38+
CONFIG_NR_CPUS=256
39+
CONFIG_NUMA=y
40+
CONFIG_HZ_100=y
41+
CONFIG_KEXEC_FILE=y
42+
CONFIG_CRASH_DUMP=y
43+
CONFIG_HIBERNATION=y
44+
CONFIG_PM_DEBUG=y
45+
CONFIG_CMM=m
3746
CONFIG_OPROFILE=y
3847
CONFIG_KPROBES=y
3948
CONFIG_JUMP_LABEL=y
@@ -44,11 +53,7 @@ CONFIG_BLK_DEV_INTEGRITY=y
4453
CONFIG_PARTITION_ADVANCED=y
4554
CONFIG_IBM_PARTITION=y
4655
CONFIG_DEFAULT_DEADLINE=y
47-
CONFIG_LIVEPATCH=y
48-
CONFIG_NR_CPUS=256
49-
CONFIG_NUMA=y
50-
CONFIG_HZ_100=y
51-
CONFIG_KEXEC_FILE=y
56+
CONFIG_BINFMT_MISC=m
5257
CONFIG_MEMORY_HOTPLUG=y
5358
CONFIG_MEMORY_HOTREMOVE=y
5459
CONFIG_KSM=y
@@ -60,9 +65,6 @@ CONFIG_ZBUD=m
6065
CONFIG_ZSMALLOC=m
6166
CONFIG_ZSMALLOC_STAT=y
6267
CONFIG_IDLE_PAGE_TRACKING=y
63-
CONFIG_CRASH_DUMP=y
64-
CONFIG_BINFMT_MISC=m
65-
CONFIG_HIBERNATION=y
6668
CONFIG_NET=y
6769
CONFIG_PACKET=y
6870
CONFIG_UNIX=y
@@ -98,6 +100,7 @@ CONFIG_BLK_DEV_NBD=m
98100
CONFIG_BLK_DEV_RAM=y
99101
CONFIG_VIRTIO_BLK=y
100102
CONFIG_SCSI=y
103+
# CONFIG_SCSI_MQ_DEFAULT is not set
101104
CONFIG_BLK_DEV_SD=y
102105
CONFIG_CHR_DEV_ST=y
103106
CONFIG_BLK_DEV_SR=y
@@ -131,6 +134,7 @@ CONFIG_EQUALIZER=m
131134
CONFIG_TUN=m
132135
CONFIG_VIRTIO_NET=y
133136
# CONFIG_NET_VENDOR_ALACRITECH is not set
137+
# CONFIG_NET_VENDOR_AURORA is not set
134138
# CONFIG_NET_VENDOR_CORTINA is not set
135139
# CONFIG_NET_VENDOR_SOLARFLARE is not set
136140
# CONFIG_NET_VENDOR_SOCIONEXT is not set
@@ -157,33 +161,6 @@ CONFIG_TMPFS=y
157161
CONFIG_TMPFS_POSIX_ACL=y
158162
CONFIG_HUGETLBFS=y
159163
# CONFIG_NETWORK_FILESYSTEMS is not set
160-
CONFIG_DEBUG_INFO=y
161-
CONFIG_DEBUG_INFO_DWARF4=y
162-
CONFIG_GDB_SCRIPTS=y
163-
CONFIG_UNUSED_SYMBOLS=y
164-
CONFIG_DEBUG_SECTION_MISMATCH=y
165-
CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y
166-
CONFIG_MAGIC_SYSRQ=y
167-
CONFIG_DEBUG_PAGEALLOC=y
168-
CONFIG_DETECT_HUNG_TASK=y
169-
CONFIG_PANIC_ON_OOPS=y
170-
CONFIG_PROVE_LOCKING=y
171-
CONFIG_LOCK_STAT=y
172-
CONFIG_DEBUG_LOCKDEP=y
173-
CONFIG_DEBUG_ATOMIC_SLEEP=y
174-
CONFIG_DEBUG_LIST=y
175-
CONFIG_DEBUG_SG=y
176-
CONFIG_DEBUG_NOTIFIERS=y
177-
CONFIG_RCU_CPU_STALL_TIMEOUT=60
178-
CONFIG_LATENCYTOP=y
179-
CONFIG_SCHED_TRACER=y
180-
CONFIG_FTRACE_SYSCALLS=y
181-
CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP=y
182-
CONFIG_STACK_TRACER=y
183-
CONFIG_BLK_DEV_IO_TRACE=y
184-
CONFIG_FUNCTION_PROFILER=y
185-
# CONFIG_RUNTIME_TESTING_MENU is not set
186-
CONFIG_S390_PTDUMP=y
187164
CONFIG_CRYPTO_CRYPTD=m
188165
CONFIG_CRYPTO_AUTHENC=m
189166
CONFIG_CRYPTO_TEST=m
@@ -193,6 +170,7 @@ CONFIG_CRYPTO_CBC=y
193170
CONFIG_CRYPTO_CFB=m
194171
CONFIG_CRYPTO_CTS=m
195172
CONFIG_CRYPTO_LRW=m
173+
CONFIG_CRYPTO_OFB=m
196174
CONFIG_CRYPTO_PCBC=m
197175
CONFIG_CRYPTO_XTS=m
198176
CONFIG_CRYPTO_CMAC=m
@@ -231,7 +209,6 @@ CONFIG_CRYPTO_USER_API_HASH=m
231209
CONFIG_CRYPTO_USER_API_SKCIPHER=m
232210
CONFIG_CRYPTO_USER_API_RNG=m
233211
CONFIG_ZCRYPT=m
234-
CONFIG_ZCRYPT_MULTIDEVNODES=y
235212
CONFIG_PKEY=m
236213
CONFIG_CRYPTO_PAES_S390=m
237214
CONFIG_CRYPTO_SHA1_S390=m
@@ -247,4 +224,30 @@ CONFIG_CRC7=m
247224
# CONFIG_XZ_DEC_ARM is not set
248225
# CONFIG_XZ_DEC_ARMTHUMB is not set
249226
# CONFIG_XZ_DEC_SPARC is not set
250-
CONFIG_CMM=m
227+
CONFIG_DEBUG_INFO=y
228+
CONFIG_DEBUG_INFO_DWARF4=y
229+
CONFIG_GDB_SCRIPTS=y
230+
CONFIG_UNUSED_SYMBOLS=y
231+
CONFIG_DEBUG_SECTION_MISMATCH=y
232+
CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y
233+
CONFIG_MAGIC_SYSRQ=y
234+
CONFIG_DEBUG_PAGEALLOC=y
235+
CONFIG_DETECT_HUNG_TASK=y
236+
CONFIG_PANIC_ON_OOPS=y
237+
CONFIG_PROVE_LOCKING=y
238+
CONFIG_LOCK_STAT=y
239+
CONFIG_DEBUG_LOCKDEP=y
240+
CONFIG_DEBUG_ATOMIC_SLEEP=y
241+
CONFIG_DEBUG_LIST=y
242+
CONFIG_DEBUG_SG=y
243+
CONFIG_DEBUG_NOTIFIERS=y
244+
CONFIG_RCU_CPU_STALL_TIMEOUT=60
245+
CONFIG_LATENCYTOP=y
246+
CONFIG_SCHED_TRACER=y
247+
CONFIG_FTRACE_SYSCALLS=y
248+
CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP=y
249+
CONFIG_STACK_TRACER=y
250+
CONFIG_BLK_DEV_IO_TRACE=y
251+
CONFIG_FUNCTION_PROFILER=y
252+
# CONFIG_RUNTIME_TESTING_MENU is not set
253+
CONFIG_S390_PTDUMP=y

‎arch/s390/include/asm/mmu_context.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@ static inline int init_new_context(struct task_struct *tsk,
4646
mm->context.asce_limit = STACK_TOP_MAX;
4747
mm->context.asce = __pa(mm->pgd) | _ASCE_TABLE_LENGTH |
4848
_ASCE_USER_BITS | _ASCE_TYPE_REGION3;
49-
/* pgd_alloc() did not account this pud */
50-
mm_inc_nr_puds(mm);
5149
break;
5250
case -PAGE_SIZE:
5351
/* forked 5-level task, set new asce with new_mm->pgd */
@@ -63,9 +61,6 @@ static inline int init_new_context(struct task_struct *tsk,
6361
/* forked 2-level compat task, set new asce with new mm->pgd */
6462
mm->context.asce = __pa(mm->pgd) | _ASCE_TABLE_LENGTH |
6563
_ASCE_USER_BITS | _ASCE_TYPE_SEGMENT;
66-
/* pgd_alloc() did not account this pmd */
67-
mm_inc_nr_pmds(mm);
68-
mm_inc_nr_puds(mm);
6964
}
7065
crst_table_init((unsigned long *) mm->pgd, pgd_entry_type(mm));
7166
return 0;

0 commit comments

Comments
 (0)