x86: add flags parameter to reserve_bootmem_generic()

This patch adds a 'flags' parameter to reserve_bootmem_generic() like it
already has been added in reserve_bootmem() with commit
72a7fe3967dbf86cb34e24fbf1d957fe24d2f246.

It also changes all users to use BOOTMEM_DEFAULT, which doesn't effectively
change the behaviour. Since the change is x86-specific, I don't think it's
necessary to add a new API for migration. There are only 4 users of that
function.

The change is necessary for the next patch, using reserve_bootmem_generic()
for crashkernel reservation.

Signed-off-by: Bernhard Walle <bwalle@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/arch/x86/kernel/e820_64.c b/arch/x86/kernel/e820_64.c
index 124480c0008dd2a5e348cd2db7b928ff13d3aa41..af1eb0789740bd4dde7923be8e845c6f55414caa 100644 (file)
--- a/arch/x86/kernel/e820_64.c
+++ b/arch/x86/kernel/e820_64.c
@@ -118,7 +118,8 @@ void __init early_res_to_bootmem(unsigned long start, unsigned long end)
                        continue;
                printk(KERN_INFO "  early res: %d [%lx-%lx] %s\n", i,
                        final_start, final_end - 1, r->name);
-               reserve_bootmem_generic(final_start, final_end - final_start);
+               reserve_bootmem_generic(final_start, final_end - final_start,
+                               BOOTMEM_DEFAULT);
        }
 }
 

diff --git a/arch/x86/kernel/efi_64.c b/arch/x86/kernel/efi_64.c
index d0060fdcccac1658968db527f4c05d791b056e6b..d561dd5f1e629a93830273585e97e7279b0046e5 100644 (file)
--- a/arch/x86/kernel/efi_64.c
+++ b/arch/x86/kernel/efi_64.c
@@ -100,7 +100,8 @@ void __init efi_call_phys_epilog(void)
 void __init efi_reserve_bootmem(void)
 {
        reserve_bootmem_generic((unsigned long)memmap.phys_map,
-                               memmap.nr_map * memmap.desc_size);
+                               memmap.nr_map * memmap.desc_size,
+                               BOOTMEM_DEFAULT);
 }
 
 void __iomem * __init efi_ioremap(unsigned long phys_addr, unsigned long size)

diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c
index 404683b94e79592c69e04930ed385056f8f5861c..4901ae3f742cc93bfb1bf7e2bdc7ec89c79c7b89 100644 (file)
--- a/arch/x86/kernel/mpparse.c
+++ b/arch/x86/kernel/mpparse.c
@@ -729,10 +729,11 @@ static int __init smp_scan_config(unsigned long base, unsigned long length,
                        if (!reserve)
                                return 1;
 
-                       reserve_bootmem_generic(virt_to_phys(mpf), PAGE_SIZE);
+                       reserve_bootmem_generic(virt_to_phys(mpf), PAGE_SIZE,
+                               BOOTMEM_DEFAULT);
                        if (mpf->mpf_physptr)
                                reserve_bootmem_generic(mpf->mpf_physptr,
-                                                       PAGE_SIZE);
+                                       PAGE_SIZE, BOOTMEM_DEFAULT);
 #endif
                return 1;
                }

diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 819dad973b1375bc5da5a90297c5c41788d2a652..bf7bf1de6c25aa1a6b461474b762718bb9c73dca 100644 (file)
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -799,12 +799,13 @@ void free_initrd_mem(unsigned long start, unsigned long end)
 }
 #endif
 
-void __init reserve_bootmem_generic(unsigned long phys, unsigned len)
+int __init reserve_bootmem_generic(unsigned long phys, unsigned len, int flags)
 {
 #ifdef CONFIG_NUMA
        int nid, next_nid;
 #endif
        unsigned long pfn = phys >> PAGE_SHIFT;
+       int ret;
 
        if (pfn >= end_pfn) {
                /*
@@ -812,11 +813,11 @@ void __init reserve_bootmem_generic(unsigned long phys, unsigned len)
                 * firmware tables:
                 */
                if (pfn < max_pfn_mapped)
-                       return;
+                       return -EFAULT;
 
                printk(KERN_ERR "reserve_bootmem: illegal reserve %lx %u\n",
                                phys, len);
-               return;
+               return -EFAULT;
        }
 
        /* Should check here against the e820 map to avoid double free */
@@ -824,9 +825,13 @@ void __init reserve_bootmem_generic(unsigned long phys, unsigned len)
        nid = phys_to_nid(phys);
        next_nid = phys_to_nid(phys + len - 1);
        if (nid == next_nid)
-               reserve_bootmem_node(NODE_DATA(nid), phys, len, BOOTMEM_DEFAULT);
+               ret = reserve_bootmem_node(NODE_DATA(nid), phys, len, flags);
        else
-               reserve_bootmem(phys, len, BOOTMEM_DEFAULT);
+               ret = reserve_bootmem(phys, len, flags);
+
+       if (ret != 0)
+               return ret;
+
 #else
        reserve_bootmem(phys, len, BOOTMEM_DEFAULT);
 #endif
@@ -835,6 +840,8 @@ void __init reserve_bootmem_generic(unsigned long phys, unsigned len)
                dma_reserve += len / PAGE_SIZE;
                set_dma_reserve(dma_reserve);
        }
+
+       return 0;
 }
 
 int kern_addr_valid(unsigned long addr)

diff --git a/include/asm-x86/proto.h b/include/asm-x86/proto.h
index 6c8b41b03f6def5593696d12752c3627028e10b3..a9f51472521e9c8bfb621aa86882811d71e62a2d 100644 (file)
--- a/include/asm-x86/proto.h
+++ b/include/asm-x86/proto.h
@@ -14,7 +14,7 @@ extern void ia32_syscall(void);
 extern void ia32_cstar_target(void);
 extern void ia32_sysenter_target(void);
 
-extern void reserve_bootmem_generic(unsigned long phys, unsigned len);
+extern int reserve_bootmem_generic(unsigned long phys, unsigned len, int flags);
 
 extern void syscall32_cpu_init(void);