Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[mirror_ubuntu-focal-kernel.git] / fs / proc / base.c

diff --git a/fs/proc/base.c b/fs/proc/base.c
index e5d89a0d0b8a7bceb29dae702436a572dc041336..ad3b0762cc3e952bf7c8c7bd717d186d93c21376 100644 (file)
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -232,7 +232,7 @@ static ssize_t proc_pid_cmdline_read(struct file *file, char __user *buf,
                goto out_mmput;
        }
 
-       page = (char *)__get_free_page(GFP_TEMPORARY);
+       page = (char *)__get_free_page(GFP_KERNEL);
        if (!page) {
                rv = -ENOMEM;
                goto out_mmput;
@@ -813,7 +813,7 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
        if (!mm)
                return 0;
 
-       page = (char *)__get_free_page(GFP_TEMPORARY);
+       page = (char *)__get_free_page(GFP_KERNEL);
        if (!page)
                return -ENOMEM;
 
@@ -918,7 +918,7 @@ static ssize_t environ_read(struct file *file, char __user *buf,
        if (!mm || !mm->env_end)
                return 0;
 
-       page = (char *)__get_free_page(GFP_TEMPORARY);
+       page = (char *)__get_free_page(GFP_KERNEL);
        if (!page)
                return -ENOMEM;
 
@@ -1630,7 +1630,7 @@ out:
 
 static int do_proc_readlink(struct path *path, char __user *buffer, int buflen)
 {
-       char *tmp = (char*)__get_free_page(GFP_TEMPORARY);
+       char *tmp = (char *)__get_free_page(GFP_KERNEL);
        char *pathname;
        int len;