From 0a0a78ac2e13eebad2bff6b6480a461a9fec61d4 Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Thu, 26 Jul 2018 18:07:34 +0900 Subject: [PATCH] mcctrl: replace GFP_TEMPORARY by GFP_KERNEL See linux's commit 0ee931c4 ("mm: treewide: remove GFP_TEMPORARY allocation flag") for a long explanation, but basically that flag "is just cargo cult" and should be removed Change-Id: I2147cd65b6b9ec509a72e11cc3abf1fe1561c10b --- executer/kernel/mcctrl/control.c | 4 ++-- executer/kernel/mcctrl/syscall.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/executer/kernel/mcctrl/control.c b/executer/kernel/mcctrl/control.c index 6578bb20..2220122f 100644 --- a/executer/kernel/mcctrl/control.c +++ b/executer/kernel/mcctrl/control.c @@ -1750,13 +1750,13 @@ int mcexec_open_exec(ihk_os_t os, char * __user filename) return -EINVAL; } - pathbuf = kmalloc(PATH_MAX, GFP_TEMPORARY); + pathbuf = kmalloc(PATH_MAX, GFP_KERNEL); if (!pathbuf) { retval = -ENOMEM; goto out; } - kfilename = kmalloc(PATH_MAX, GFP_TEMPORARY); + kfilename = kmalloc(PATH_MAX, GFP_KERNEL); if (!kfilename) { retval = -ENOMEM; kfree(pathbuf); diff --git a/executer/kernel/mcctrl/syscall.c b/executer/kernel/mcctrl/syscall.c index 3d98b2cf..402df0c3 100644 --- a/executer/kernel/mcctrl/syscall.c +++ b/executer/kernel/mcctrl/syscall.c @@ -1205,7 +1205,7 @@ static int pager_get_path(struct file *file, char *path) { int error = 0; char *pathbuf, *fullpath; - pathbuf = kmalloc(PATH_MAX, GFP_TEMPORARY); + pathbuf = kmalloc(PATH_MAX, GFP_KERNEL); if (!pathbuf) { printk("%s: ERROR: allocating path\n", __FUNCTION__); error = -ENOMEM; @@ -1313,7 +1313,7 @@ static int pager_req_create(ihk_os_t os, int fd, uintptr_t result_pa) { char *pathbuf, *fullpath; - pathbuf = kmalloc(PATH_MAX, GFP_TEMPORARY); + pathbuf = kmalloc(PATH_MAX, GFP_KERNEL); if (pathbuf) { fullpath = d_path(&file->f_path, pathbuf, PATH_MAX); if (!IS_ERR(fullpath)) {