Skip to contentSkip to conversation

s390 patches for 4.0-rc6

GIT PULL Martin Schwidefsky 1 participant 1 message Mar 26, 2015

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

Hi Linus,

please pull from the 'for-linus' branch of

git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git for-linus

to receive the following updates:

A couple of bug fixes for s390. The ftrace comile fix is quite large for a -rc6 release, but it would be nice to have it in 4.0.

Heiko Carstens (2):
s390/ftrace: fix compile error if CONFIG_KPROBES is disabled s390/smp: reenable smt after resume

Hendrik Brueckner (1):
s390/cpum_sf: add diagnostic sampling event only if it is authorized

Martin Schwidefsky (1):
s390/mm: limit STACK_RND_MASK for compat tasks

 arch/s390/include/asm/elf.h     |  2 +-
 arch/s390/kernel/ftrace.c       | 61 ++++++++++++++++++++++++++++++-----------
 arch/s390/kernel/perf_cpum_sf.c |  7 +++--
 arch/s390/kernel/swsusp_asm64.S | 11 ++++++++
 4 files changed, 62 insertions(+), 19 deletions(-)
arch/s390/include/asm/elf.h +1 -1
index c9df40b..c9c875d 100644
@@ -211,7 +211,7 @@ do {								\
 
 extern unsigned long mmap_rnd_mask;
 
-#define STACK_RND_MASK	(mmap_rnd_mask)
+#define STACK_RND_MASK	(test_thread_flag(TIF_31BIT) ? 0x7ff : mmap_rnd_mask)
 
 #define ARCH_DLINFO							    \
 do {									    \
arch/s390/kernel/ftrace.c +45 -16

92 lines not on this page · raw message

arch/s390/kernel/perf_cpum_sf.c +5 -2
index c3f8d15..e6a1578 100644
@@ -1415,7 +1415,7 @@ CPUMF_EVENT_ATTR(SF, SF_CYCLES_BASIC_DIAG, PERF_EVENT_CPUM_SF_DIAG);
 
 static struct attribute *cpumsf_pmu_events_attr[] = {
 	CPUMF_EVENT_PTR(SF, SF_CYCLES_BASIC),
-	CPUMF_EVENT_PTR(SF, SF_CYCLES_BASIC_DIAG),
+	NULL,
 	NULL,
 };
 
@@ -1606,8 +1606,11 @@ static int __init init_cpum_sampling_pmu(void)
 		return -EINVAL;
 	}
 
-	if (si.ad)
+	if (si.ad) {
 		sfb_set_limits(CPUM_SF_MIN_SDB, CPUM_SF_MAX_SDB);
+		cpumsf_pmu_events_attr[1] =
+			CPUMF_EVENT_PTR(SF, SF_CYCLES_BASIC_DIAG);
+	}
 
 	sfdbg = debug_register(KMSG_COMPONENT, 2, 1, 80);
 	if (!sfdbg)
arch/s390/kernel/swsusp_asm64.S +11 -0
index 6b09fdf..ca62946 100644
@@ -177,6 +177,17 @@ restart_entry:
 	lhi	%r1,1
 	sigp	%r1,%r0,SIGP_SET_ARCHITECTURE
 	sam64
+#ifdef CONFIG_SMP
+	larl	%r1,smp_cpu_mt_shift
+	icm	%r1,15,0(%r1)
+	jz	smt_done
+	llgfr	%r1,%r1
+smt_loop:
+	sigp	%r1,%r0,SIGP_SET_MULTI_THREADING
+	brc	8,smt_done			/* accepted */
+	brc	2,smt_loop			/* busy, try again */
+smt_done:
+#endif
 	larl	%r1,.Lnew_pgm_check_psw
 	lpswe	0(%r1)
 pgm_check_entry: