diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-01 14:15:54 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-01 14:15:54 +0200 |
| commit | dc8a64ee1ab3f7ef34488392de7ee908047d6f99 (patch) | |
| tree | 4db9103f405a6c1cf709058db91c56e5efd2b061 /arch/s390/include | |
| parent | Merge branch 'parisc-4.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | s390: wire up preadv2/pwritev2 syscalls (diff) | |
| download | linux-dc8a64ee1ab3f7ef34488392de7ee908047d6f99.tar.xz linux-dc8a64ee1ab3f7ef34488392de7ee908047d6f99.zip | |
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
Diffstat (limited to 'arch/s390/include')
| -rw-r--r-- | arch/s390/include/asm/cache.h | 3 | ||||
| -rw-r--r-- | arch/s390/include/uapi/asm/unistd.h | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/arch/s390/include/asm/cache.h b/arch/s390/include/asm/cache.h index 4d7ccac5fd1d..22da3b34c655 100644 --- a/arch/s390/include/asm/cache.h +++ b/arch/s390/include/asm/cache.h @@ -15,4 +15,7 @@ #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 diff --git a/arch/s390/include/uapi/asm/unistd.h b/arch/s390/include/uapi/asm/unistd.h index ab3aa6875a59..4384bc797a54 100644 --- a/arch/s390/include/uapi/asm/unistd.h +++ b/arch/s390/include/uapi/asm/unistd.h @@ -311,7 +311,9 @@ #define __NR_shutdown 373 #define __NR_mlock2 374 #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 |