linux-kernel - Re: [PATCH 23/25] x86: Have nobootmem version setup_bootmem

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Tue, 29 Jun 2010 12:02:57 -0600
From:	Bjorn Helgaas <bjorn.helgaas@...com>
To:	Yinghai Lu <yinghai@...nel.org>
Cc:	Ingo Molnar <mingo@...e.hu>, Thomas Gleixner <tglx@...utronix.de>,
	"H. Peter Anvin" <hpa@...or.com>,
	Andrew Morton <akpm@...ux-foundation.org>,
	David Miller <davem@...emloft.net>,
	Benjamin Herrenschmidt <benh@...nel.crashing.org>,
	Linus Torvalds <torvalds@...ux-foundation.org>,
	Johannes Weiner <hannes@...xchg.org>,
	linux-kernel@...r.kernel.org, linux-arch@...r.kernel.org
Subject: Re: [PATCH 23/25] x86: Have nobootmem version setup_bootmem_allocator()

On Tuesday, June 22, 2010 11:26:52 am Yinghai Lu wrote:
> We can reduce #ifdef number from 3 to one in init_32.c
> 
> Signed-off-by: Yinghai Lu <yinghai@...nel.org>
> ---
>  arch/x86/mm/init_32.c |   15 ++++++++++-----
>  1 files changed, 10 insertions(+), 5 deletions(-)
> 
> diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
> index e3ae067..f172aa3 100644
> --- a/arch/x86/mm/init_32.c
> +++ b/arch/x86/mm/init_32.c
> @@ -771,11 +771,9 @@ static unsigned long __init setup_node_bootmem(int nodeid,
>  
>  	return bootmap + bootmap_size;
>  }
> -#endif
>  
>  void __init setup_bootmem_allocator(void)
>  {
> -#ifndef CONFIG_NO_BOOTMEM
>  	int nodeid;
>  	unsigned long bootmap_size, bootmap;
>  	/*
> @@ -787,13 +785,11 @@ void __init setup_bootmem_allocator(void)
>  	if (bootmap == (unsigned long)LMB_ERROR)
>  		panic("Cannot find bootmem map of size %ld\n", bootmap_size);
>  	lmb_reserve_range(bootmap, bootmap + bootmap_size, "BOOTMAP");
> -#endif
>  
>  	printk(KERN_INFO "  mapped low ram: 0 - %08lx\n",
>  		 max_pfn_mapped<<PAGE_SHIFT);
>  	printk(KERN_INFO "  low ram: 0 - %08lx\n", max_low_pfn<<PAGE_SHIFT);
>  
> -#ifndef CONFIG_NO_BOOTMEM
>  	for_each_online_node(nodeid) {
>  		 unsigned long start_pfn, end_pfn;
>  
> @@ -811,10 +807,19 @@ void __init setup_bootmem_allocator(void)
>  		bootmap = setup_node_bootmem(nodeid, start_pfn, end_pfn,
>  						 bootmap);
>  	}
> -#endif
>  
>  	after_bootmem = 1;
>  }
> +#else
> +void __init setup_bootmem_allocator(void)
> +{
> +	printk(KERN_INFO "  mapped low ram: 0 - %08lx\n",
> +		 max_pfn_mapped<<PAGE_SHIFT);
> +	printk(KERN_INFO "  low ram: 0 - %08lx\n", max_low_pfn<<PAGE_SHIFT);

Please use %pR format here and fix up the other printks above in the
other #ifdef branch.

> +
> +	after_bootmem = 1;
> +}
> +#endif
>  
>  /*
>   * paging_init() sets up the page tables - note that the first 8MB are
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/