diff options
| author | Petr Mladek <pmladek@suse.com> | 2018-01-22 10:40:50 +0100 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.com> | 2018-01-22 10:40:50 +0100 |
| commit | 51ccbb0ae865e153c43117e6c3244fa373ea6bd6 (patch) | |
| tree | 4bfa54ad5ec0542f24627971d937166960c32723 /drivers | |
| parent | 3ccdc5190f8df12dfafff9264e406c5496401da5 (diff) | |
| parent | d2279c9d7f7db7f97567368bfc4539b3411adf8d (diff) | |
Merge branch 'for-4.16-print-symbol' into for-4.16
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/base/core.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c index 110230d86527..409298942d5a 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -22,7 +22,6 @@ #include <linux/of.h> #include <linux/of_device.h> #include <linux/genhd.h> -#include <linux/kallsyms.h> #include <linux/mutex.h> #include <linux/pm_runtime.h> #include <linux/netdevice.h> @@ -687,8 +686,8 @@ static ssize_t dev_attr_show(struct kobject *kobj, struct attribute *attr, if (dev_attr->show) ret = dev_attr->show(dev, dev_attr, buf); if (ret >= (ssize_t)PAGE_SIZE) { - print_symbol("dev_attr_show: %s returned bad count\n", - (unsigned long)dev_attr->show); + printk("dev_attr_show: %pS returned bad count\n", + dev_attr->show); } return ret; } |