diff options
| author | Brian Norris <computersforpeace@gmail.com> | 2014-07-21 02:59:16 -0400 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2014-07-21 03:01:16 -0400 |
| commit | d0d5864676dbccfb1337864a0ae6ce97e6342678 (patch) | |
| tree | 7caa674ec05a1797054cd4304f0a047b6dacddd6 /drivers/s390/crypto/ap_bus.c | |
| parent | 6534e6809e6c9d48114b537afe03bee3fd33bf01 (diff) | |
| parent | 9a3c4145af32125c5ee39c0272662b47307a8323 (diff) | |
Merge tag 'v3.16-rc6' into MTD development branch
Linux 3.16-rc6
Diffstat (limited to 'drivers/s390/crypto/ap_bus.c')
| -rw-r--r-- | drivers/s390/crypto/ap_bus.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c index 8eec1653c9cc..69ef4f8cfac8 100644 --- a/drivers/s390/crypto/ap_bus.c +++ b/drivers/s390/crypto/ap_bus.c | |||
| @@ -77,12 +77,12 @@ MODULE_ALIAS("z90crypt"); | |||
| 77 | * Module parameter | 77 | * Module parameter |
| 78 | */ | 78 | */ |
| 79 | int ap_domain_index = -1; /* Adjunct Processor Domain Index */ | 79 | int ap_domain_index = -1; /* Adjunct Processor Domain Index */ |
| 80 | module_param_named(domain, ap_domain_index, int, 0000); | 80 | module_param_named(domain, ap_domain_index, int, S_IRUSR|S_IRGRP); |
| 81 | MODULE_PARM_DESC(domain, "domain index for ap devices"); | 81 | MODULE_PARM_DESC(domain, "domain index for ap devices"); |
| 82 | EXPORT_SYMBOL(ap_domain_index); | 82 | EXPORT_SYMBOL(ap_domain_index); |
| 83 | 83 | ||
| 84 | static int ap_thread_flag = 0; | 84 | static int ap_thread_flag = 0; |
| 85 | module_param_named(poll_thread, ap_thread_flag, int, 0000); | 85 | module_param_named(poll_thread, ap_thread_flag, int, S_IRUSR|S_IRGRP); |
| 86 | MODULE_PARM_DESC(poll_thread, "Turn on/off poll thread, default is 0 (off)."); | 86 | MODULE_PARM_DESC(poll_thread, "Turn on/off poll thread, default is 0 (off)."); |
| 87 | 87 | ||
| 88 | static struct device *ap_root_device = NULL; | 88 | static struct device *ap_root_device = NULL; |