s390 updates for 6.7-rc3
- 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. -----BEGIN PGP SIGNATURE----- iI0EABYIADUWIQQrtrZiYVkVzKQcYivNdxKlNrRb8AUCZWDU1BccYWdvcmRlZXZA bGludXguaWJtLmNvbQAKCRDNdxKlNrRb8IG0AQD6UXh8wqSJZrGKooI8+lz/BtmT ni9/m2k2/Cq3hDZzigEAidSvS4ly/lCFL/eNl7woItP4W6Vc0NOji/gNe+rQnwQ= =3rTL -----END PGP SIGNATURE----- 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
This commit is contained in:
commit
0f5cc96c36
5 changed files with 7 additions and 10 deletions
|
|
@ -228,7 +228,6 @@ typedef struct thread_struct thread_struct;
|
||||||
execve_tail(); \
|
execve_tail(); \
|
||||||
} while (0)
|
} while (0)
|
||||||
|
|
||||||
/* Forward declaration, a strange C thing */
|
|
||||||
struct task_struct;
|
struct task_struct;
|
||||||
struct mm_struct;
|
struct mm_struct;
|
||||||
struct seq_file;
|
struct seq_file;
|
||||||
|
|
|
||||||
|
|
@ -666,6 +666,7 @@ static int __init ipl_init(void)
|
||||||
&ipl_ccw_attr_group_lpar);
|
&ipl_ccw_attr_group_lpar);
|
||||||
break;
|
break;
|
||||||
case IPL_TYPE_ECKD:
|
case IPL_TYPE_ECKD:
|
||||||
|
case IPL_TYPE_ECKD_DUMP:
|
||||||
rc = sysfs_create_group(&ipl_kset->kobj, &ipl_eckd_attr_group);
|
rc = sysfs_create_group(&ipl_kset->kobj, &ipl_eckd_attr_group);
|
||||||
break;
|
break;
|
||||||
case IPL_TYPE_FCP:
|
case IPL_TYPE_FCP:
|
||||||
|
|
|
||||||
|
|
@ -279,12 +279,6 @@ static int paicrypt_event_init(struct perf_event *event)
|
||||||
if (IS_ERR(cpump))
|
if (IS_ERR(cpump))
|
||||||
return PTR_ERR(cpump);
|
return PTR_ERR(cpump);
|
||||||
|
|
||||||
/* Event initialization sets last_tag to 0. When later on the events
|
|
||||||
* are deleted and re-added, do not reset the event count value to zero.
|
|
||||||
* Events are added, deleted and re-added when 2 or more events
|
|
||||||
* are active at the same time.
|
|
||||||
*/
|
|
||||||
event->hw.last_tag = 0;
|
|
||||||
event->destroy = paicrypt_event_destroy;
|
event->destroy = paicrypt_event_destroy;
|
||||||
|
|
||||||
if (a->sample_period) {
|
if (a->sample_period) {
|
||||||
|
|
@ -318,6 +312,11 @@ static void paicrypt_start(struct perf_event *event, int flags)
|
||||||
{
|
{
|
||||||
u64 sum;
|
u64 sum;
|
||||||
|
|
||||||
|
/* Event initialization sets last_tag to 0. When later on the events
|
||||||
|
* are deleted and re-added, do not reset the event count value to zero.
|
||||||
|
* Events are added, deleted and re-added when 2 or more events
|
||||||
|
* are active at the same time.
|
||||||
|
*/
|
||||||
if (!event->hw.last_tag) {
|
if (!event->hw.last_tag) {
|
||||||
event->hw.last_tag = 1;
|
event->hw.last_tag = 1;
|
||||||
sum = paicrypt_getall(event); /* Get current value */
|
sum = paicrypt_getall(event); /* Get current value */
|
||||||
|
|
|
||||||
|
|
@ -260,7 +260,6 @@ static int paiext_event_init(struct perf_event *event)
|
||||||
rc = paiext_alloc(a, event);
|
rc = paiext_alloc(a, event);
|
||||||
if (rc)
|
if (rc)
|
||||||
return rc;
|
return rc;
|
||||||
event->hw.last_tag = 0;
|
|
||||||
event->destroy = paiext_event_destroy;
|
event->destroy = paiext_event_destroy;
|
||||||
|
|
||||||
if (a->sample_period) {
|
if (a->sample_period) {
|
||||||
|
|
|
||||||
|
|
@ -97,8 +97,7 @@ my (@stack, $re, $dre, $sub, $x, $xs, $funcre, $min_stack);
|
||||||
# 11160: a7 fb ff 60 aghi %r15,-160
|
# 11160: a7 fb ff 60 aghi %r15,-160
|
||||||
# or
|
# or
|
||||||
# 100092: e3 f0 ff c8 ff 71 lay %r15,-56(%r15)
|
# 100092: e3 f0 ff c8 ff 71 lay %r15,-56(%r15)
|
||||||
$re = qr/.*(?:lay|ag?hi).*\%r15,-(([0-9]{2}|[3-9])[0-9]{2})
|
$re = qr/.*(?:lay|ag?hi).*\%r15,-([0-9]+)(?:\(\%r15\))?$/o;
|
||||||
(?:\(\%r15\))?$/ox;
|
|
||||||
} elsif ($arch eq 'sparc' || $arch eq 'sparc64') {
|
} elsif ($arch eq 'sparc' || $arch eq 'sparc64') {
|
||||||
# f0019d10: 9d e3 bf 90 save %sp, -112, %sp
|
# f0019d10: 9d e3 bf 90 save %sp, -112, %sp
|
||||||
$re = qr/.*save.*%sp, -(([0-9]{2}|[3-9])[0-9]{2}), %sp/o;
|
$re = qr/.*save.*%sp, -(([0-9]{2}|[3-9])[0-9]{2}), %sp/o;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue