diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-05-05 10:01:34 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-05-05 10:01:34 +0200 |
| commit | 12e2c41148a9e68bc3b261954961db9d28decf47 (patch) | |
| tree | 6b52bbd4b222f3995090320b08a54fece5a12d48 /kernel/module.c | |
| parent | c427f69564e2a844c5fcf2804042609342513da0 (diff) | |
| parent | 1504269814263c9676b4605a6a91e14dc6ceac21 (diff) | |
| download | lwn-12e2c41148a9e68bc3b261954961db9d28decf47.tar.gz lwn-12e2c41148a9e68bc3b261954961db9d28decf47.zip | |
Merge branch 'linus' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/module.c')
| -rw-r--r-- | kernel/module.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/module.c b/kernel/module.c index a6e43a5806a1..ce8066b88178 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -1472,7 +1472,8 @@ static ssize_t module_sect_show(struct module_attribute *mattr, { struct module_sect_attr *sattr = container_of(mattr, struct module_sect_attr, mattr); - return sprintf(buf, "0x%pK\n", (void *)sattr->address); + return sprintf(buf, "0x%px\n", kptr_restrict < 2 ? + (void *)sattr->address : NULL); } static void free_sect_attrs(struct module_sect_attrs *sect_attrs) |