projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'nfsd-4.6' of git://linux-nfs.org/~bfields/linux
[deliverable/linux.git]
/
mm
/
mempolicy.c
diff --git
a/mm/mempolicy.c
b/mm/mempolicy.c
index 8cbc74387df38c5572001bd2e06bd8da1af5ab70..36cc01bc950a6e5f8ef94c0d0506f463e01791d9 100644
(file)
--- a/
mm/mempolicy.c
+++ b/
mm/mempolicy.c
@@
-846,12
+846,12
@@
static void get_policy_nodemask(struct mempolicy *p, nodemask_t *nodes)
}
}
}
}
-static int lookup_node(
struct mm_struct *mm,
unsigned long addr)
+static int lookup_node(unsigned long addr)
{
struct page *p;
int err;
{
struct page *p;
int err;
- err = get_user_pages(
current, mm,
addr & PAGE_MASK, 1, 0, 0, &p, NULL);
+ err = get_user_pages(addr & PAGE_MASK, 1, 0, 0, &p, NULL);
if (err >= 0) {
err = page_to_nid(p);
put_page(p);
if (err >= 0) {
err = page_to_nid(p);
put_page(p);
@@
-906,7
+906,7
@@
static long do_get_mempolicy(int *policy, nodemask_t *nmask,
if (flags & MPOL_F_NODE) {
if (flags & MPOL_F_ADDR) {
if (flags & MPOL_F_NODE) {
if (flags & MPOL_F_ADDR) {
- err = lookup_node(
mm,
addr);
+ err = lookup_node(addr);
if (err < 0)
goto out;
*policy = err;
if (err < 0)
goto out;
*policy = err;
@@
-2559,9
+2559,7
@@
static void __init check_numabalancing_enable(void)
set_numabalancing_state(numabalancing_override == 1);
if (num_online_nodes() > 1 && !numabalancing_override) {
set_numabalancing_state(numabalancing_override == 1);
if (num_online_nodes() > 1 && !numabalancing_override) {
- pr_info("%s automatic NUMA balancing. "
- "Configure with numa_balancing= or the "
- "kernel.numa_balancing sysctl",
+ pr_info("%s automatic NUMA balancing. Configure with numa_balancing= or the kernel.numa_balancing sysctl\n",
numabalancing_default ? "Enabling" : "Disabling");
set_numabalancing_state(numabalancing_default);
}
numabalancing_default ? "Enabling" : "Disabling");
set_numabalancing_state(numabalancing_default);
}
This page took
0.02674 seconds
and
5
git commands to generate.