Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 's390-5.4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Vasily Gorbik:
- defconfig updates
- Fix build errors with CC_OPTIMIZE_FOR_SIZE due to usage of "i"
constraint for function arguments. Two kvm changes acked-by Christian
Borntraeger.
- Fix -Wunused-but-set-variable warnings in mm code.
- Avoid a constant misuse in qdio.
- Handle a case when cpumf is temporarily unavailable.
* tag 's390-5.4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
KVM: s390: mark __insn32_query() as __always_inline
KVM: s390: fix __insn32_query() inline assembly
s390: update defconfigs
s390/pci: mark function(s) __always_inline
s390/mm: mark function(s) __always_inline
s390/jump_label: mark function(s) __always_inline
s390/cpu_mf: mark function(s) __always_inline
s390/atomic,bitops: mark function(s) __always_inline
s390/mm: fix -Wunused-but-set-variable warnings
s390: mark __cpacf_query() as __always_inline
s390/qdio: clarify size of the QIB parm area
s390/cpumf: Fix indentation in sampling device driver
s390/cpumsf: Check for CPU Measurement sampling
s390/cpumf: Use consistant debug print format
+83
-53
+16
-8
arch/s390/configs/debug_defconfig
+16
-8
arch/s390/configs/debug_defconfig
···
44
44
CONFIG_NUMA=y
45
45
CONFIG_HZ_100=y
46
46
CONFIG_KEXEC_FILE=y
47
+
CONFIG_KEXEC_SIG=y
47
48
CONFIG_EXPOLINE=y
48
49
CONFIG_EXPOLINE_AUTO=y
49
50
CONFIG_CHSC_SCH=y
···
70
69
CONFIG_MODULE_FORCE_UNLOAD=y
71
70
CONFIG_MODVERSIONS=y
72
71
CONFIG_MODULE_SRCVERSION_ALL=y
73
-
CONFIG_MODULE_SIG=y
74
72
CONFIG_MODULE_SIG_SHA256=y
73
+
CONFIG_UNUSED_SYMBOLS=y
75
74
CONFIG_BLK_DEV_INTEGRITY=y
76
75
CONFIG_BLK_DEV_THROTTLING=y
77
76
CONFIG_BLK_WBT=y
78
77
CONFIG_BLK_CGROUP_IOLATENCY=y
78
+
CONFIG_BLK_CGROUP_IOCOST=y
79
79
CONFIG_PARTITION_ADVANCED=y
80
80
CONFIG_IBM_PARTITION=y
81
81
CONFIG_BSD_DISKLABEL=y
···
372
370
CONFIG_CGROUP_NET_PRIO=y
373
371
CONFIG_BPF_JIT=y
374
372
CONFIG_NET_PKTGEN=m
373
+
# CONFIG_NET_DROP_MONITOR is not set
375
374
CONFIG_PCI=y
376
375
CONFIG_PCI_DEBUG=y
377
376
CONFIG_HOTPLUG_PCI=y
···
427
424
CONFIG_DM_SNAPSHOT=m
428
425
CONFIG_DM_THIN_PROVISIONING=m
429
426
CONFIG_DM_WRITECACHE=m
427
+
CONFIG_DM_CLONE=m
430
428
CONFIG_DM_MIRROR=m
431
429
CONFIG_DM_LOG_USERSPACE=m
432
430
CONFIG_DM_RAID=m
···
439
435
CONFIG_DM_UEVENT=y
440
436
CONFIG_DM_FLAKEY=m
441
437
CONFIG_DM_VERITY=m
438
+
CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y
442
439
CONFIG_DM_SWITCH=m
443
440
CONFIG_NETDEVICES=y
444
441
CONFIG_BONDING=m
···
494
489
# CONFIG_NET_VENDOR_NVIDIA is not set
495
490
# CONFIG_NET_VENDOR_OKI is not set
496
491
# CONFIG_NET_VENDOR_PACKET_ENGINES is not set
492
+
# CONFIG_NET_VENDOR_PENSANDO is not set
497
493
# CONFIG_NET_VENDOR_QLOGIC is not set
498
494
# CONFIG_NET_VENDOR_QUALCOMM is not set
499
495
# CONFIG_NET_VENDOR_RDC is not set
···
544
538
CONFIG_WATCHDOG_NOWAYOUT=y
545
539
CONFIG_SOFT_WATCHDOG=m
546
540
CONFIG_DIAG288_WATCHDOG=m
547
-
CONFIG_DRM=y
548
-
CONFIG_DRM_VIRTIO_GPU=y
541
+
CONFIG_FB=y
549
542
CONFIG_FRAMEBUFFER_CONSOLE=y
543
+
CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
550
544
# CONFIG_HID is not set
551
545
# CONFIG_USB_SUPPORT is not set
552
546
CONFIG_INFINIBAND=m
553
547
CONFIG_INFINIBAND_USER_ACCESS=m
554
548
CONFIG_MLX4_INFINIBAND=m
555
549
CONFIG_MLX5_INFINIBAND=m
550
+
CONFIG_SYNC_FILE=y
556
551
CONFIG_VFIO=m
557
552
CONFIG_VFIO_PCI=m
558
553
CONFIG_VFIO_MDEV=m
···
587
580
CONFIG_FS_DAX=y
588
581
CONFIG_EXPORTFS_BLOCK_OPS=y
589
582
CONFIG_FS_ENCRYPTION=y
583
+
CONFIG_FS_VERITY=y
584
+
CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y
590
585
CONFIG_FANOTIFY=y
591
586
CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
592
587
CONFIG_QUOTA_NETLINK_INTERFACE=y
···
598
589
CONFIG_AUTOFS4_FS=m
599
590
CONFIG_FUSE_FS=y
600
591
CONFIG_CUSE=m
592
+
CONFIG_VIRTIO_FS=m
601
593
CONFIG_OVERLAY_FS=m
602
594
CONFIG_FSCACHE=m
603
595
CONFIG_CACHEFILES=m
···
658
648
CONFIG_SECURITY_SELINUX=y
659
649
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
660
650
CONFIG_SECURITY_SELINUX_DISABLE=y
651
+
CONFIG_SECURITY_LOCKDOWN_LSM=y
652
+
CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y
661
653
CONFIG_INTEGRITY_SIGNATURE=y
662
654
CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
663
655
CONFIG_IMA=y
664
656
CONFIG_IMA_DEFAULT_HASH_SHA256=y
665
657
CONFIG_IMA_WRITE_POLICY=y
666
658
CONFIG_IMA_APPRAISE=y
659
+
CONFIG_LSM="yama,loadpin,safesetid,integrity,selinux,smack,tomoyo,apparmor"
667
660
CONFIG_CRYPTO_USER=m
668
661
# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
669
662
CONFIG_CRYPTO_PCRYPT=m
···
677
664
CONFIG_CRYPTO_ECRDSA=m
678
665
CONFIG_CRYPTO_CHACHA20POLY1305=m
679
666
CONFIG_CRYPTO_AEGIS128=m
680
-
CONFIG_CRYPTO_AEGIS128L=m
681
-
CONFIG_CRYPTO_AEGIS256=m
682
-
CONFIG_CRYPTO_MORUS640=m
683
-
CONFIG_CRYPTO_MORUS1280=m
684
667
CONFIG_CRYPTO_CFB=m
685
668
CONFIG_CRYPTO_LRW=m
686
669
CONFIG_CRYPTO_PCBC=m
···
748
739
CONFIG_DEBUG_INFO_DWARF4=y
749
740
CONFIG_GDB_SCRIPTS=y
750
741
CONFIG_FRAME_WARN=1024
751
-
CONFIG_UNUSED_SYMBOLS=y
752
742
CONFIG_HEADERS_INSTALL=y
753
743
CONFIG_HEADERS_CHECK=y
754
744
CONFIG_DEBUG_SECTION_MISMATCH=y
+16
-9
arch/s390/configs/defconfig
+16
-9
arch/s390/configs/defconfig
···
44
44
# CONFIG_NUMA_EMU is not set
45
45
CONFIG_HZ_100=y
46
46
CONFIG_KEXEC_FILE=y
47
+
CONFIG_KEXEC_SIG=y
47
48
CONFIG_EXPOLINE=y
48
49
CONFIG_EXPOLINE_AUTO=y
49
50
CONFIG_CHSC_SCH=y
···
67
66
CONFIG_MODULE_FORCE_UNLOAD=y
68
67
CONFIG_MODVERSIONS=y
69
68
CONFIG_MODULE_SRCVERSION_ALL=y
70
-
CONFIG_MODULE_SIG=y
71
69
CONFIG_MODULE_SIG_SHA256=y
70
+
CONFIG_UNUSED_SYMBOLS=y
72
71
CONFIG_BLK_DEV_THROTTLING=y
73
72
CONFIG_BLK_WBT=y
74
73
CONFIG_BLK_CGROUP_IOLATENCY=y
74
+
CONFIG_BLK_CGROUP_IOCOST=y
75
75
CONFIG_PARTITION_ADVANCED=y
76
76
CONFIG_IBM_PARTITION=y
77
77
CONFIG_BSD_DISKLABEL=y
···
365
363
CONFIG_CGROUP_NET_PRIO=y
366
364
CONFIG_BPF_JIT=y
367
365
CONFIG_NET_PKTGEN=m
366
+
# CONFIG_NET_DROP_MONITOR is not set
368
367
CONFIG_PCI=y
369
368
CONFIG_HOTPLUG_PCI=y
370
369
CONFIG_HOTPLUG_PCI_S390=y
···
421
418
CONFIG_DM_SNAPSHOT=m
422
419
CONFIG_DM_THIN_PROVISIONING=m
423
420
CONFIG_DM_WRITECACHE=m
421
+
CONFIG_DM_CLONE=m
424
422
CONFIG_DM_MIRROR=m
425
423
CONFIG_DM_LOG_USERSPACE=m
426
424
CONFIG_DM_RAID=m
···
433
429
CONFIG_DM_UEVENT=y
434
430
CONFIG_DM_FLAKEY=m
435
431
CONFIG_DM_VERITY=m
432
+
CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y
436
433
CONFIG_DM_SWITCH=m
437
434
CONFIG_DM_INTEGRITY=m
438
435
CONFIG_NETDEVICES=y
···
489
484
# CONFIG_NET_VENDOR_NVIDIA is not set
490
485
# CONFIG_NET_VENDOR_OKI is not set
491
486
# CONFIG_NET_VENDOR_PACKET_ENGINES is not set
487
+
# CONFIG_NET_VENDOR_PENSANDO is not set
492
488
# CONFIG_NET_VENDOR_QLOGIC is not set
493
489
# CONFIG_NET_VENDOR_QUALCOMM is not set
494
490
# CONFIG_NET_VENDOR_RDC is not set
···
539
533
CONFIG_WATCHDOG_NOWAYOUT=y
540
534
CONFIG_SOFT_WATCHDOG=m
541
535
CONFIG_DIAG288_WATCHDOG=m
542
-
CONFIG_DRM=y
543
-
CONFIG_DRM_VIRTIO_GPU=y
544
-
# CONFIG_BACKLIGHT_CLASS_DEVICE is not set
536
+
CONFIG_FB=y
545
537
CONFIG_FRAMEBUFFER_CONSOLE=y
538
+
CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
546
539
# CONFIG_HID is not set
547
540
# CONFIG_USB_SUPPORT is not set
548
541
CONFIG_INFINIBAND=m
549
542
CONFIG_INFINIBAND_USER_ACCESS=m
550
543
CONFIG_MLX4_INFINIBAND=m
551
544
CONFIG_MLX5_INFINIBAND=m
545
+
CONFIG_SYNC_FILE=y
552
546
CONFIG_VFIO=m
553
547
CONFIG_VFIO_PCI=m
554
548
CONFIG_VFIO_MDEV=m
···
579
573
CONFIG_FS_DAX=y
580
574
CONFIG_EXPORTFS_BLOCK_OPS=y
581
575
CONFIG_FS_ENCRYPTION=y
576
+
CONFIG_FS_VERITY=y
577
+
CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y
582
578
CONFIG_FANOTIFY=y
583
579
CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
584
580
CONFIG_QUOTA_NETLINK_INTERFACE=y
···
589
581
CONFIG_AUTOFS4_FS=m
590
582
CONFIG_FUSE_FS=y
591
583
CONFIG_CUSE=m
584
+
CONFIG_VIRTIO_FS=m
592
585
CONFIG_OVERLAY_FS=m
593
586
CONFIG_FSCACHE=m
594
587
CONFIG_CACHEFILES=m
···
648
639
CONFIG_SECURITY_SELINUX=y
649
640
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
650
641
CONFIG_SECURITY_SELINUX_DISABLE=y
642
+
CONFIG_SECURITY_LOCKDOWN_LSM=y
643
+
CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y
651
644
CONFIG_INTEGRITY_SIGNATURE=y
652
645
CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
653
646
CONFIG_IMA=y
654
647
CONFIG_IMA_DEFAULT_HASH_SHA256=y
655
648
CONFIG_IMA_WRITE_POLICY=y
656
649
CONFIG_IMA_APPRAISE=y
650
+
CONFIG_LSM="yama,loadpin,safesetid,integrity,selinux,smack,tomoyo,apparmor"
657
651
CONFIG_CRYPTO_FIPS=y
658
652
CONFIG_CRYPTO_USER=m
659
653
# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
···
668
656
CONFIG_CRYPTO_ECRDSA=m
669
657
CONFIG_CRYPTO_CHACHA20POLY1305=m
670
658
CONFIG_CRYPTO_AEGIS128=m
671
-
CONFIG_CRYPTO_AEGIS128L=m
672
-
CONFIG_CRYPTO_AEGIS256=m
673
-
CONFIG_CRYPTO_MORUS640=m
674
-
CONFIG_CRYPTO_MORUS1280=m
675
659
CONFIG_CRYPTO_CFB=m
676
660
CONFIG_CRYPTO_LRW=m
677
661
CONFIG_CRYPTO_OFB=m
···
735
727
CONFIG_DEBUG_INFO_DWARF4=y
736
728
CONFIG_GDB_SCRIPTS=y
737
729
CONFIG_FRAME_WARN=1024
738
-
CONFIG_UNUSED_SYMBOLS=y
739
730
CONFIG_DEBUG_SECTION_MISMATCH=y
740
731
CONFIG_MAGIC_SYSRQ=y
741
732
CONFIG_DEBUG_MEMORY_INIT=y
+1
-1
arch/s390/configs/zfcpdump_defconfig
+1
-1
arch/s390/configs/zfcpdump_defconfig
+1
-1
arch/s390/include/asm/atomic_ops.h
+1
-1
arch/s390/include/asm/atomic_ops.h
···
41
41
#undef __ATOMIC_OP
42
42
43
43
#define __ATOMIC_CONST_OP(op_name, op_type, op_string, op_barrier) \
44
-
static inline void op_name(op_type val, op_type *ptr) \
44
+
static __always_inline void op_name(op_type val, op_type *ptr) \
45
45
{ \
46
46
asm volatile( \
47
47
op_string " %[ptr],%[val]\n" \
+4
-4
arch/s390/include/asm/bitops.h
+4
-4
arch/s390/include/asm/bitops.h
···
56
56
return ((unsigned char *)ptr) + ((nr ^ (BITS_PER_LONG - 8)) >> 3);
57
57
}
58
58
59
-
static inline void arch_set_bit(unsigned long nr, volatile unsigned long *ptr)
59
+
static __always_inline void arch_set_bit(unsigned long nr, volatile unsigned long *ptr)
60
60
{
61
61
unsigned long *addr = __bitops_word(nr, ptr);
62
62
unsigned long mask;
···
77
77
__atomic64_or(mask, (long *)addr);
78
78
}
79
79
80
-
static inline void arch_clear_bit(unsigned long nr, volatile unsigned long *ptr)
80
+
static __always_inline void arch_clear_bit(unsigned long nr, volatile unsigned long *ptr)
81
81
{
82
82
unsigned long *addr = __bitops_word(nr, ptr);
83
83
unsigned long mask;
···
98
98
__atomic64_and(mask, (long *)addr);
99
99
}
100
100
101
-
static inline void arch_change_bit(unsigned long nr,
102
-
volatile unsigned long *ptr)
101
+
static __always_inline void arch_change_bit(unsigned long nr,
102
+
volatile unsigned long *ptr)
103
103
{
104
104
unsigned long *addr = __bitops_word(nr, ptr);
105
105
unsigned long mask;
+1
-1
arch/s390/include/asm/cpacf.h
+1
-1
arch/s390/include/asm/cpacf.h
···
171
171
*
172
172
* Returns 1 if @func is available for @opcode, 0 otherwise
173
173
*/
174
-
static inline void __cpacf_query(unsigned int opcode, cpacf_mask_t *mask)
174
+
static __always_inline void __cpacf_query(unsigned int opcode, cpacf_mask_t *mask)
175
175
{
176
176
register unsigned long r0 asm("0") = 0; /* query function */
177
177
register unsigned long r1 asm("1") = (unsigned long) mask;
+6
-2
arch/s390/include/asm/cpu_mf.h
+6
-2
arch/s390/include/asm/cpu_mf.h
···
28
28
CPU_MF_INT_SF_PRA|CPU_MF_INT_SF_SACA| \
29
29
CPU_MF_INT_SF_LSDA)
30
30
31
+
#define CPU_MF_SF_RIBM_NOTAV 0x1 /* Sampling unavailable */
32
+
31
33
/* CPU measurement facility support */
32
34
static inline int cpum_cf_avail(void)
33
35
{
···
71
69
unsigned long max_sampl_rate; /* 16-23: maximum sampling interval*/
72
70
unsigned long tear; /* 24-31: TEAR contents */
73
71
unsigned long dear; /* 32-39: DEAR contents */
74
-
unsigned int rsvrd0; /* 40-43: reserved */
72
+
unsigned int rsvrd0:24; /* 40-42: reserved */
73
+
unsigned int ribm:8; /* 43: Reserved by IBM */
75
74
unsigned int cpu_speed; /* 44-47: CPU speed */
76
75
unsigned long long rsvrd1; /* 48-55: reserved */
77
76
unsigned long long rsvrd2; /* 56-63: reserved */
···
223
220
MT_DIAG = 5,
224
221
MT_DIAG_CLEARING = 9, /* clears loss-of-MT-ctr-data alert */
225
222
};
226
-
static inline int stcctm(enum stcctm_ctr_set set, u64 range, u64 *dest)
223
+
224
+
static __always_inline int stcctm(enum stcctm_ctr_set set, u64 range, u64 *dest)
227
225
{
228
226
int cc;
229
227
+7
-2
arch/s390/include/asm/hugetlb.h
+7
-2
arch/s390/include/asm/hugetlb.h
···
12
12
#include <asm/page.h>
13
13
#include <asm/pgtable.h>
14
14
15
-
16
-
#define is_hugepage_only_range(mm, addr, len) 0
17
15
#define hugetlb_free_pgd_range free_pgd_range
18
16
#define hugepages_supported() (MACHINE_HAS_EDAT1)
19
17
···
20
22
pte_t huge_ptep_get(pte_t *ptep);
21
23
pte_t huge_ptep_get_and_clear(struct mm_struct *mm,
22
24
unsigned long addr, pte_t *ptep);
25
+
26
+
static inline bool is_hugepage_only_range(struct mm_struct *mm,
27
+
unsigned long addr,
28
+
unsigned long len)
29
+
{
30
+
return false;
31
+
}
23
32
24
33
/*
25
34
* If the arch doesn't supply something else, assume that hugepage
+2
-2
arch/s390/include/asm/jump_label.h
+2
-2
arch/s390/include/asm/jump_label.h
···
20
20
* We use a brcl 0,2 instruction for jump labels at compile time so it
21
21
* can be easily distinguished from a hotpatch generated instruction.
22
22
*/
23
-
static inline bool arch_static_branch(struct static_key *key, bool branch)
23
+
static __always_inline bool arch_static_branch(struct static_key *key, bool branch)
24
24
{
25
25
asm_volatile_goto("0: brcl 0,"__stringify(JUMP_LABEL_NOP_OFFSET)"\n"
26
26
".pushsection __jump_table,\"aw\"\n"
···
34
34
return true;
35
35
}
36
36
37
-
static inline bool arch_static_branch_jump(struct static_key *key, bool branch)
37
+
static __always_inline bool arch_static_branch_jump(struct static_key *key, bool branch)
38
38
{
39
39
asm_volatile_goto("0: brcl 15,%l[label]\n"
40
40
".pushsection __jump_table,\"aw\"\n"
+13
-12
arch/s390/include/asm/pgtable.h
+13
-12
arch/s390/include/asm/pgtable.h
···
997
997
#define IPTE_NODAT 0x400
998
998
#define IPTE_GUEST_ASCE 0x800
999
999
1000
-
static inline void __ptep_ipte(unsigned long address, pte_t *ptep,
1001
-
unsigned long opt, unsigned long asce,
1002
-
int local)
1000
+
static __always_inline void __ptep_ipte(unsigned long address, pte_t *ptep,
1001
+
unsigned long opt, unsigned long asce,
1002
+
int local)
1003
1003
{
1004
1004
unsigned long pto = (unsigned long) ptep;
1005
1005
···
1020
1020
: [r1] "a" (pto), [m4] "i" (local) : "memory");
1021
1021
}
1022
1022
1023
-
static inline void __ptep_ipte_range(unsigned long address, int nr,
1024
-
pte_t *ptep, int local)
1023
+
static __always_inline void __ptep_ipte_range(unsigned long address, int nr,
1024
+
pte_t *ptep, int local)
1025
1025
{
1026
1026
unsigned long pto = (unsigned long) ptep;
1027
1027
···
1269
1269
1270
1270
#define pte_offset_kernel(pmd, address) pte_offset(pmd, address)
1271
1271
#define pte_offset_map(pmd, address) pte_offset_kernel(pmd, address)
1272
-
#define pte_unmap(pte) do { } while (0)
1272
+
1273
+
static inline void pte_unmap(pte_t *pte) { }
1273
1274
1274
1275
static inline bool gup_fast_permitted(unsigned long start, unsigned long end)
1275
1276
{
···
1436
1435
#define IDTE_NODAT 0x1000
1437
1436
#define IDTE_GUEST_ASCE 0x2000
1438
1437
1439
-
static inline void __pmdp_idte(unsigned long addr, pmd_t *pmdp,
1440
-
unsigned long opt, unsigned long asce,
1441
-
int local)
1438
+
static __always_inline void __pmdp_idte(unsigned long addr, pmd_t *pmdp,
1439
+
unsigned long opt, unsigned long asce,
1440
+
int local)
1442
1441
{
1443
1442
unsigned long sto;
1444
1443
···
1462
1461
}
1463
1462
}
1464
1463
1465
-
static inline void __pudp_idte(unsigned long addr, pud_t *pudp,
1466
-
unsigned long opt, unsigned long asce,
1467
-
int local)
1464
+
static __always_inline void __pudp_idte(unsigned long addr, pud_t *pudp,
1465
+
unsigned long opt, unsigned long asce,
1466
+
int local)
1468
1467
{
1469
1468
unsigned long r3o;
1470
1469
+1
-1
arch/s390/include/asm/qdio.h
+1
-1
arch/s390/include/asm/qdio.h
+2
-2
arch/s390/kernel/perf_cpum_cf_diag.c
+2
-2
arch/s390/kernel/perf_cpum_cf_diag.c
···
390
390
391
391
debug_sprintf_event(cf_diag_dbg, 6,
392
392
"%s ctrset %d ctrset_size %zu cfvn %d csvn %d"
393
-
" need %zd rc:%d\n",
393
+
" need %zd rc %d\n",
394
394
__func__, ctrset, ctrset_size, cpuhw->info.cfvn,
395
395
cpuhw->info.csvn, need, rc);
396
396
return need;
···
567
567
int err = 0;
568
568
569
569
debug_sprintf_event(cf_diag_dbg, 5,
570
-
"%s event %p cpu %d flags %#x cpuhw:%p\n",
570
+
"%s event %p cpu %d flags %#x cpuhw %p\n",
571
571
__func__, event, event->cpu, flags, cpuhw);
572
572
573
573
if (cpuhw->flags & PMU_F_IN_USE) {
+7
-1
arch/s390/kernel/perf_cpum_sf.c
+7
-1
arch/s390/kernel/perf_cpum_sf.c
···
803
803
goto out;
804
804
}
805
805
806
+
if (si.ribm & CPU_MF_SF_RIBM_NOTAV) {
807
+
pr_warn("CPU Measurement Facility sampling is temporarily not available\n");
808
+
err = -EBUSY;
809
+
goto out;
810
+
}
811
+
806
812
/* Always enable basic sampling */
807
813
SAMPL_FLAGS(hwc) = PERF_CPUM_SF_BASIC_MODE;
808
814
···
901
895
902
896
/* Check online status of the CPU to which the event is pinned */
903
897
if (event->cpu >= 0 && !cpu_online(event->cpu))
904
-
return -ENODEV;
898
+
return -ENODEV;
905
899
906
900
/* Force reset of idle/hv excludes regardless of what the
907
901
* user requested.
+3
-3
arch/s390/kvm/kvm-s390.c
+3
-3
arch/s390/kvm/kvm-s390.c
···
332
332
return cc == 0;
333
333
}
334
334
335
-
static inline void __insn32_query(unsigned int opcode, u8 query[32])
335
+
static __always_inline void __insn32_query(unsigned int opcode, u8 *query)
336
336
{
337
337
register unsigned long r0 asm("0") = 0; /* query function */
338
338
register unsigned long r1 asm("1") = (unsigned long) query;
···
340
340
asm volatile(
341
341
/* Parameter regs are ignored */
342
342
" .insn rrf,%[opc] << 16,2,4,6,0\n"
343
-
: "=m" (*query)
343
+
:
344
344
: "d" (r0), "a" (r1), [opc] "i" (opcode)
345
-
: "cc");
345
+
: "cc", "memory");
346
346
}
347
347
348
348
#define INSN_SORTL 0xb938
+1
-1
arch/s390/pci/pci_clp.c
+1
-1
arch/s390/pci/pci_clp.c
···
66
66
/*
67
67
* Call Logical Processor with c=0, the give constant lps and an lpcb request.
68
68
*/
69
-
static inline int clp_req(void *data, unsigned int lps)
69
+
static __always_inline int clp_req(void *data, unsigned int lps)
70
70
{
71
71
struct { u8 _[CLP_BLK_SIZE]; } *req = data;
72
72
u64 ignored;
+1
-1
drivers/s390/cio/qdio_setup.c
+1
-1
drivers/s390/cio/qdio_setup.c
+1
-2
drivers/s390/net/qeth_core_main.c
+1
-2
drivers/s390/net/qeth_core_main.c
···
4715
4715
4716
4716
QETH_CARD_TEXT(card, 2, "qdioest");
4717
4717
4718
-
qib_param_field = kzalloc(QDIO_MAX_BUFFERS_PER_Q,
4719
-
GFP_KERNEL);
4718
+
qib_param_field = kzalloc(FIELD_SIZEOF(struct qib, parm), GFP_KERNEL);
4720
4719
if (!qib_param_field) {
4721
4720
rc = -ENOMEM;
4722
4721
goto out_free_nothing;