diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-02-09 01:18:14 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-02-09 01:18:14 +0100 |
| commit | 56c7303e62996fc7b49aea1fd967ccdf94f3a5d9 (patch) | |
| tree | 9e5ff563595eb3d5d274a293d87fb811d168e762 /lib | |
| parent | 6e978b22efa1db9f6e71b24440b5f1d93e968ee3 (diff) | |
| parent | 565ebe8073f84ced436a18e76a5ba8e6bb73dfb3 (diff) | |
Merge back earlier cpufreq changes for v4.11.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ioremap.c | 1 | ||||
| -rw-r--r-- | lib/radix-tree.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/lib/ioremap.c b/lib/ioremap.c index 86c8911b0e3a..a3e14ce92a56 100644 --- a/lib/ioremap.c +++ b/lib/ioremap.c @@ -144,4 +144,3 @@ int ioremap_page_range(unsigned long addr, return err; } -EXPORT_SYMBOL_GPL(ioremap_page_range); diff --git a/lib/radix-tree.c b/lib/radix-tree.c index 0b92d605fb69..84812a9fb16f 100644 --- a/lib/radix-tree.c +++ b/lib/radix-tree.c @@ -769,7 +769,7 @@ static void radix_tree_free_nodes(struct radix_tree_node *node) struct radix_tree_node *old = child; offset = child->offset + 1; child = child->parent; - WARN_ON_ONCE(!list_empty(&node->private_list)); + WARN_ON_ONCE(!list_empty(&old->private_list)); radix_tree_node_free(old); if (old == entry_to_node(node)) return; |