projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mm/memory-failure.c: move set_migratetype_isolate() outside get_any_page()
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
mm
/
ksm.c
diff --git
a/mm/ksm.c
b/mm/ksm.c
index
b6afe0c
..
175fff7
100644
(file)
--- a/
mm/ksm.c
+++ b/
mm/ksm.c
@@
-2194,7
+2194,7
@@
static ssize_t sleep_millisecs_store(struct kobject *kobj,
unsigned long msecs;
int err;
unsigned long msecs;
int err;
- err =
strict_
strtoul(buf, 10, &msecs);
+ err =
k
strtoul(buf, 10, &msecs);
if (err || msecs > UINT_MAX)
return -EINVAL;
if (err || msecs > UINT_MAX)
return -EINVAL;
@@
-2217,7
+2217,7
@@
static ssize_t pages_to_scan_store(struct kobject *kobj,
int err;
unsigned long nr_pages;
int err;
unsigned long nr_pages;
- err =
strict_
strtoul(buf, 10, &nr_pages);
+ err =
k
strtoul(buf, 10, &nr_pages);
if (err || nr_pages > UINT_MAX)
return -EINVAL;
if (err || nr_pages > UINT_MAX)
return -EINVAL;
@@
-2239,7
+2239,7
@@
static ssize_t run_store(struct kobject *kobj, struct kobj_attribute *attr,
int err;
unsigned long flags;
int err;
unsigned long flags;
- err =
strict_
strtoul(buf, 10, &flags);
+ err =
k
strtoul(buf, 10, &flags);
if (err || flags > UINT_MAX)
return -EINVAL;
if (flags > KSM_RUN_UNMERGE)
if (err || flags > UINT_MAX)
return -EINVAL;
if (flags > KSM_RUN_UNMERGE)
@@
-2309,8
+2309,8
@@
static ssize_t merge_across_nodes_store(struct kobject *kobj,
* Allocate stable and unstable together:
* MAXSMP NODES_SHIFT 10 will use 16kB.
*/
* Allocate stable and unstable together:
* MAXSMP NODES_SHIFT 10 will use 16kB.
*/
- buf = kcalloc(nr_node_ids + nr_node_ids,
-
sizeof(*buf), GFP_KERNEL | __GFP_ZERO
);
+ buf = kcalloc(nr_node_ids + nr_node_ids,
sizeof(*buf),
+
GFP_KERNEL
);
/* Let us assume that RB_ROOT is NULL is zero */
if (!buf)
err = -ENOMEM;
/* Let us assume that RB_ROOT is NULL is zero */
if (!buf)
err = -ENOMEM;