Commit 0f5cc96c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 1bcc6897 aab1f809

arch/s390/include/asm/processor.h

+0 −1
Original line number Diff line number Diff line
@@ -228,7 +228,6 @@ typedef struct thread_struct thread_struct; 
	execve_tail();							\

} while (0)



/* Forward declaration, a strange C thing */

struct task_struct;

struct mm_struct;

struct seq_file;

arch/s390/kernel/ipl.c

+1 −0
Original line number Diff line number Diff line
@@ -666,6 +666,7 @@ static int __init ipl_init(void) 
						&ipl_ccw_attr_group_lpar);

		break;

	case IPL_TYPE_ECKD:

	case IPL_TYPE_ECKD_DUMP:

		rc = sysfs_create_group(&ipl_kset->kobj, &ipl_eckd_attr_group);

		break;

	case IPL_TYPE_FCP:

arch/s390/kernel/perf_pai_crypto.c

+5 −6
Original line number Diff line number Diff line
@@ -279,12 +279,6 @@ static int paicrypt_event_init(struct perf_event *event) 
	if (IS_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;



	if (a->sample_period) {
@@ -318,6 +312,11 @@ static void paicrypt_start(struct perf_event *event, int flags) 
{

	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) {

		event->hw.last_tag = 1;

		sum = paicrypt_getall(event);		/* Get current value */

arch/s390/kernel/perf_pai_ext.c

+0 −1
Original line number Diff line number Diff line
@@ -260,7 +260,6 @@ static int paiext_event_init(struct perf_event *event) 
	rc = paiext_alloc(a, event);

	if (rc)

		return rc;

	event->hw.last_tag = 0;

	event->destroy = paiext_event_destroy;



	if (a->sample_period) {

scripts/checkstack.pl

+1 −2
Original line number Diff line number Diff line
@@ -97,8 +97,7 @@ my (@stack, $re, $dre, $sub, $x, $xs, $funcre, $min_stack); 
		#   11160:       a7 fb ff 60             aghi   %r15,-160

		# or

		#  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})

		      (?:\(\%r15\))?$/ox;

		$re = qr/.*(?:lay|ag?hi).*\%r15,-([0-9]+)(?:\(\%r15\))?$/o;

	} elsif ($arch eq 'sparc' || $arch eq 'sparc64') {

		# f0019d10:       9d e3 bf 90     save  %sp, -112, %sp

		$re = qr/.*save.*%sp, -(([0-9]{2}|[3-9])[0-9]{2}), %sp/o;