summaryrefslogtreecommitdiffstats
path: root/drivers/s390
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-09-08 17:27:00 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2014-09-08 17:27:00 +0200
commit35af25616c6c0c42416545f732d36b2ba7199519 (patch)
treeb2e45cfe4d22ba7bd8c3b2fe0199bfa282e06224 /drivers/s390
parentMerge branch 'for-3.17-fixes' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff)
parents390/vdso: remove NULL pointer check from clock_gettime (diff)
downloadlinux-35af25616c6c0c42416545f732d36b2ba7199519.tar.xz
linux-35af25616c6c0c42416545f732d36b2ba7199519.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Martin Schwidefsky: "A bug fix for the vdso code, the loadparm for booting from SCSI is added and the access permissions for the dasd module parameters are corrected" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: s390/vdso: remove NULL pointer check from clock_gettime s390/ipl: Add missing SCSI loadparm attributes to /sys/firmware s390/dasd: Make module parameter visible in sysfs
Diffstat (limited to 'drivers/s390')
-rw-r--r--drivers/s390/block/dasd_devmap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/block/dasd_devmap.c b/drivers/s390/block/dasd_devmap.c
index 2ead7e78c456..14ba80bfa571 100644
--- a/drivers/s390/block/dasd_devmap.c
+++ b/drivers/s390/block/dasd_devmap.c
@@ -77,7 +77,7 @@ EXPORT_SYMBOL_GPL(dasd_nofcx);
* strings when running as a module.
*/
static char *dasd[256];
-module_param_array(dasd, charp, NULL, 0);
+module_param_array(dasd, charp, NULL, S_IRUGO);
/*
* Single spinlock to protect devmap and servermap structures and lists.