Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc8a64ee authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull s390 fixes from Martin Schwidefsky:
 - A proper fix for the locking issue in the dasd driver
 - Wire up the new preadv2 nad pwritev2 system calls
 - Add the mark_rodata_ro function and set DEBUG_RODATA=y
 - A few more bug fixes.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390: wire up preadv2/pwritev2 syscalls
  s390/pci: PCI function group 0 is valid for clp_query_pci_fn
  s390/crypto: provide correct file mode at device register.
  s390/mm: handle PTE-mapped tail pages in fast gup
  s390: add DEBUG_RODATA support
  s390: disable postinit-readonly for now
  s390/dasd: reorder lcu and device lock
  s390/cpum_sf: Fix cpu hotplug notifier transitions
  s390/cpum_cf: Fix missing cpu hotplug notifier transition
parents c05c2ec9 3358999a

arch/s390/Kconfig

+3 −0
Original line number Original line Diff line number Diff line
@@ -59,6 +59,9 @@ config PCI_QUIRKS 
config ARCH_SUPPORTS_UPROBES

config ARCH_SUPPORTS_UPROBES

	def_bool y

	def_bool y





config DEBUG_RODATA

	def_bool y



config S390

config S390

	def_bool y

	def_bool y

	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE

	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE

arch/s390/crypto/prng.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -669,11 +669,13 @@ static const struct file_operations prng_tdes_fops = { 
static struct miscdevice prng_sha512_dev = {

static struct miscdevice prng_sha512_dev = {

	.name	= "prandom",

	.name	= "prandom",

	.minor	= MISC_DYNAMIC_MINOR,

	.minor	= MISC_DYNAMIC_MINOR,

	.mode	= 0644,

	.fops	= &prng_sha512_fops,

	.fops	= &prng_sha512_fops,

};

};

static struct miscdevice prng_tdes_dev = {

static struct miscdevice prng_tdes_dev = {

	.name	= "prandom",

	.name	= "prandom",

	.minor	= MISC_DYNAMIC_MINOR,

	.minor	= MISC_DYNAMIC_MINOR,

	.mode	= 0644,

	.fops	= &prng_tdes_fops,

	.fops	= &prng_tdes_fops,

};

};

arch/s390/include/asm/cache.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -15,4 +15,7 @@ 




#define __read_mostly __attribute__((__section__(".data..read_mostly")))

#define __read_mostly __attribute__((__section__(".data..read_mostly")))





/* Read-only memory is marked before mark_rodata_ro() is called. */

#define __ro_after_init __read_mostly



#endif
 
#endif

arch/s390/include/uapi/asm/unistd.h

+3 −1
Original line number Original line Diff line number Diff line
@@ -311,7 +311,9 @@ 
#define __NR_shutdown		373

#define __NR_shutdown		373

#define __NR_mlock2		374

#define __NR_mlock2		374

#define __NR_copy_file_range	375

#define __NR_copy_file_range	375

#define NR_syscalls 376

#define __NR_preadv2		376

#define __NR_pwritev2		377

#define NR_syscalls 378





/* 

/* 

 * There are some system calls that are not present on 64 bit, some

 * There are some system calls that are not present on 64 bit, some

arch/s390/kernel/perf_cpum_cf.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -670,6 +670,7 @@ static int cpumf_pmu_notifier(struct notifier_block *self, unsigned long action, 




	switch (action & ~CPU_TASKS_FROZEN) {

	switch (action & ~CPU_TASKS_FROZEN) {

	case CPU_ONLINE:

	case CPU_ONLINE:

	case CPU_DOWN_FAILED:

		flags = PMC_INIT;

		flags = PMC_INIT;

		smp_call_function_single(cpu, setup_pmc_cpu, &flags, 1);

		smp_call_function_single(cpu, setup_pmc_cpu, &flags, 1);

		break;

		break;