diff options
author | 2020-12-18 09:15:12 +0200 | |
---|---|---|
committer | 2020-12-18 09:15:12 +0200 | |
commit | 500050f0d28868af302a3c24d7d1d0191521286e (patch) | |
tree | 7c4366836fcf5c7d7be4292f60d76876b3c463a0 /kernel/sched/debug.c | |
parent | ARM: omap2: pmic-cpcap: fix maximum voltage to be consistent with defaults on xt875 (diff) | |
parent | ARM: OMAP1: OSK: fix ohci-omap breakage (diff) | |
download | linux-rng-500050f0d28868af302a3c24d7d1d0191521286e.tar.xz linux-rng-500050f0d28868af302a3c24d7d1d0191521286e.zip |
Merge branch 'fixes-omap3' into fixes
Diffstat (limited to 'kernel/sched/debug.c')
-rw-r--r-- | kernel/sched/debug.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kernel/sched/debug.c b/kernel/sched/debug.c index 0655524700d2..2357921580f9 100644 --- a/kernel/sched/debug.c +++ b/kernel/sched/debug.c @@ -251,7 +251,7 @@ static int sd_ctl_doflags(struct ctl_table *table, int write, unsigned long flags = *(unsigned long *)table->data; size_t data_size = 0; size_t len = 0; - char *tmp; + char *tmp, *buf; int idx; if (write) @@ -269,17 +269,17 @@ static int sd_ctl_doflags(struct ctl_table *table, int write, return 0; } - tmp = kcalloc(data_size + 1, sizeof(*tmp), GFP_KERNEL); - if (!tmp) + buf = kcalloc(data_size + 1, sizeof(*buf), GFP_KERNEL); + if (!buf) return -ENOMEM; for_each_set_bit(idx, &flags, __SD_FLAG_CNT) { char *name = sd_flag_debug[idx].name; - len += snprintf(tmp + len, strlen(name) + 2, "%s ", name); + len += snprintf(buf + len, strlen(name) + 2, "%s ", name); } - tmp += *ppos; + tmp = buf + *ppos; len -= *ppos; if (len > *lenp) @@ -294,7 +294,7 @@ static int sd_ctl_doflags(struct ctl_table *table, int write, *lenp = len; *ppos += len; - kfree(tmp); + kfree(buf); return 0; } |