Commit a982422b authored by Vikram Narayanan's avatar Vikram Narayanan
Browse files

merge/v4.8/lcd/microkernel: Remove obsolete API



alloc_pages_exact_node() has been replaced with __alloc_pages_node in the
kernel.

Signed-off-by: Vikram Narayanan's avatarVikram Narayanan <vikram186@gmail.com>
parent 9da60c1b
......@@ -36,7 +36,7 @@ struct lcd_arch_vmcs *lcd_arch_alloc_vmcs(int cpu)
struct lcd_arch_vmcs *vmcs;
node = cpu_to_node(cpu);
pages = alloc_pages_exact_node(node, GFP_KERNEL,
pages = __alloc_pages_node(node, GFP_KERNEL,
lcd_global_vmcs_config.order);
if (!pages)
return NULL;
......
......@@ -13,6 +13,7 @@
#include <linux/types.h>
#include <linux/spinlock.h>
#include <linux/interval_tree.h>
#include <linux/vmalloc.h>
#include <asm/lcd_domains/types.h>
#include <lcd_domains/types.h>
......@@ -532,7 +533,7 @@ int __lcd_insert_memory_object(struct lcd *caller,
* @flags: gfp flags
* @order: alloc 2^order pages
*
* This uses Linux's alloc_pages_exact_node internally.
* This uses Linux's __alloc_pages_node internally.
*/
int __lcd_alloc_pages_exact_node(struct lcd *caller, cptr_t slot, int nid,
unsigned int flags, unsigned int order);
......
......@@ -82,6 +82,8 @@ __lcd_sprint_symbol(char *buffer, hva_t hva, struct module *extra_module)
* XXX: Danger: This is for debug only. The struct module
* is mapped inside an LCD which could mess with it.
*/
/* FIXME: Refer to comments in the definition of
* get_ksymbol under kernel/module.c */
sym_name = get_ksymbol(extra_module, hva_val(hva),
&size, &offset);
if (!sym_name)
......
......@@ -120,7 +120,7 @@ int __lcd_insert_memory_object(struct lcd *caller, cptr_t slot,
mo,
__lcd_get_libcap_type(sub_type));
if (ret) {
LCD_ERR("insert");
LCD_ERR("cap_insert failed with return code %d", ret);
goto fail4;
}
/*
......@@ -174,7 +174,7 @@ int __lcd_alloc_pages_exact_node(struct lcd *caller, cptr_t slot, int nid,
/*
* Allocate zero'd pages on node
*/
p = alloc_pages_exact_node(nid, flags | __GFP_ZERO, order);
p = __alloc_pages_node(nid, flags | __GFP_ZERO, order);
if (!p) {
LCD_ERR("alloc failed");
ret = -ENOMEM;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment