mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
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
This commit is contained in:
commit
35af25616c
5 changed files with 96 additions and 62 deletions
|
|
@ -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.
|
||||
|
|
|
|||
Loading…
Reference in a new issue