Skip to content

Commit 0f5cc96

Browse files
committed
Merge tag 's390-6.7-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 updates from Alexander Gordeev: - Remove unnecessary assignment of the performance event last_tag. - Create missing /sys/firmware/ipl/* attributes when kernel is booted in dump mode using List-directed ECKD IPL. - Remove odd comment. - Fix s390-specific part of scripts/checkstack.pl script that only matches three-digit numbers starting with 3 or any higher number and skips any stack sizes smaller than 304 bytes. * tag 's390-6.7-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: scripts/checkstack.pl: match all stack sizes for s390 s390: remove odd comment s390/ipl: add missing IPL_TYPE_ECKD_DUMP case to ipl_init() s390/pai: cleanup event initialization
2 parents 1bcc689 + aab1f80 commit 0f5cc96

File tree

5 files changed

+7
-10
lines changed

5 files changed

+7
-10
lines changed

arch/s390/include/asm/processor.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,6 @@ typedef struct thread_struct thread_struct;
228228
execve_tail(); \
229229
} while (0)
230230

231-
/* Forward declaration, a strange C thing */
232231
struct task_struct;
233232
struct mm_struct;
234233
struct seq_file;

arch/s390/kernel/ipl.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -666,6 +666,7 @@ static int __init ipl_init(void)
666666
&ipl_ccw_attr_group_lpar);
667667
break;
668668
case IPL_TYPE_ECKD:
669+
case IPL_TYPE_ECKD_DUMP:
669670
rc = sysfs_create_group(&ipl_kset->kobj, &ipl_eckd_attr_group);
670671
break;
671672
case IPL_TYPE_FCP:

arch/s390/kernel/perf_pai_crypto.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -279,12 +279,6 @@ static int paicrypt_event_init(struct perf_event *event)
279279
if (IS_ERR(cpump))
280280
return PTR_ERR(cpump);
281281

282-
/* Event initialization sets last_tag to 0. When later on the events
283-
* are deleted and re-added, do not reset the event count value to zero.
284-
* Events are added, deleted and re-added when 2 or more events
285-
* are active at the same time.
286-
*/
287-
event->hw.last_tag = 0;
288282
event->destroy = paicrypt_event_destroy;
289283

290284
if (a->sample_period) {
@@ -318,6 +312,11 @@ static void paicrypt_start(struct perf_event *event, int flags)
318312
{
319313
u64 sum;
320314

315+
/* Event initialization sets last_tag to 0. When later on the events
316+
* are deleted and re-added, do not reset the event count value to zero.
317+
* Events are added, deleted and re-added when 2 or more events
318+
* are active at the same time.
319+
*/
321320
if (!event->hw.last_tag) {
322321
event->hw.last_tag = 1;
323322
sum = paicrypt_getall(event); /* Get current value */

arch/s390/kernel/perf_pai_ext.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,6 @@ static int paiext_event_init(struct perf_event *event)
260260
rc = paiext_alloc(a, event);
261261
if (rc)
262262
return rc;
263-
event->hw.last_tag = 0;
264263
event->destroy = paiext_event_destroy;
265264

266265
if (a->sample_period) {

scripts/checkstack.pl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,7 @@
9797
# 11160: a7 fb ff 60 aghi %r15,-160
9898
# or
9999
# 100092: e3 f0 ff c8 ff 71 lay %r15,-56(%r15)
100-
$re = qr/.*(?:lay|ag?hi).*\%r15,-(([0-9]{2}|[3-9])[0-9]{2})
101-
(?:\(\%r15\))?$/ox;
100+
$re = qr/.*(?:lay|ag?hi).*\%r15,-([0-9]+)(?:\(\%r15\))?$/o;
102101
} elsif ($arch eq 'sparc' || $arch eq 'sparc64') {
103102
# f0019d10: 9d e3 bf 90 save %sp, -112, %sp
104103
$re = qr/.*save.*%sp, -(([0-9]{2}|[3-9])[0-9]{2}), %sp/o;

0 commit comments

Comments
 (0)