Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 71c2742f5e6348d76ee62085cf0a13e5eff0f00e

Authored by Bernhard Walle
Committed by Linus Torvalds
1 parent a19214430d
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

Add return value to reserve_bootmem_node() 

This patch changes the function reserve_bootmem_node() from void to int,
returning -ENOMEM if the allocation fails.

This fixes a build problem on x86 with CONFIG_KEXEC=y and
CONFIG_NEED_MULTIPLE_NODES=y

Signed-off-by: Bernhard Walle <bwalle@suse.de>
Reported-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 2 changed files with 5 additions and 3 deletions Side-by-side Diff

include/linux/bootmem.h
Diff comments   View file @ 71c2742
... ... @@ -94,7 +94,7 @@
94 94 unsigned long freepfn,
95 95 unsigned long startpfn,
96 96 unsigned long endpfn);
97   -extern void reserve_bootmem_node(pg_data_t *pgdat,
  97 +extern int reserve_bootmem_node(pg_data_t *pgdat,
98 98 unsigned long physaddr,
99 99 unsigned long size,
100 100 int flags);
... ... @@ -442,15 +442,17 @@
442 442 return init_bootmem_core(pgdat, freepfn, startpfn, endpfn);
443 443 }
444 444  
445   -void __init reserve_bootmem_node(pg_data_t *pgdat, unsigned long physaddr,
  445 +int __init reserve_bootmem_node(pg_data_t *pgdat, unsigned long physaddr,
446 446 unsigned long size, int flags)
447 447 {
448 448 int ret;
449 449  
450 450 ret = can_reserve_bootmem_core(pgdat->bdata, physaddr, size, flags);
451 451 if (ret < 0)
452   - return;
  452 + return -ENOMEM;
453 453 reserve_bootmem_core(pgdat->bdata, physaddr, size, flags);
  454 +
  455 + return 0;
454 456 }
455 457  
456 458 void __init free_bootmem_node(pg_data_t *pgdat, unsigned long physaddr,