Merge tag 'v4.9.300' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y

This is the 4.9.300 stable release

Change-Id: Ib555b4887d387d6a4f4169744d43ea199146d22b
This commit is contained in:
Mauro (mdrjr) Ribeiro
2022-04-27 16:34:59 -03:00
50 changed files with 409 additions and 141 deletions

View File

@@ -38,23 +38,19 @@ ssize_t pm_show_wakelocks(char *buf, bool show_active)
{
struct rb_node *node;
struct wakelock *wl;
char *str = buf;
char *end = buf + PAGE_SIZE;
int len = 0;
mutex_lock(&wakelocks_lock);
for (node = rb_first(&wakelocks_tree); node; node = rb_next(node)) {
wl = rb_entry(node, struct wakelock, node);
if (wl->ws.active == show_active)
str += scnprintf(str, end - str, "%s ", wl->name);
len += sysfs_emit_at(buf, len, "%s ", wl->name);
}
if (str > buf)
str--;
str += scnprintf(str, end - str, "\n");
len += sysfs_emit_at(buf, len, "\n");
mutex_unlock(&wakelocks_lock);
return (str - buf);
return len;
}
#if CONFIG_PM_WAKELOCKS_LIMIT > 0