Re: Linux 2.6.22-rc1

andrew hendry
2007-05-15T05:10:49Z

almost, highstart_pfn is used in a few printks

arch/i386/mm/discontig.c: In function 'setup_memory':
arch/i386/mm/discontig.c:314: error: 'highstart_pfn' undeclared (first
use in this function)
arch/i386/mm/discontig.c:314: error: (Each undeclared identifier is
reported only once
arch/i386/mm/discontig.c:314: error: for each function it appears in.)

On 5/15/07, Linus Torvalds <torvalds@linux-foundation.org> wrote:
>
>
> On Tue, 15 May 2007, andrew hendry wrote:
> >
> > from a randconfig, attached.
> >
> > arch/i386/mm/discontig.c:107: error: expected identifier or '(' before numeric constant
>
> Gaah. That file is horrible. It redeclares a lot of stuff that it has no
> business declaring.
>
> Does this patch help?
>
> Linus
> ---
> arch/i386/mm/discontig.c | 10 +++-------
> 1 files changed, 3 insertions(+), 7 deletions(-)
>
> diff --git a/arch/i386/mm/discontig.c b/arch/i386/mm/discontig.c
> index aa58720..baac2a4 100644
> --- a/arch/i386/mm/discontig.c
> +++ b/arch/i386/mm/discontig.c
> @@ -31,6 +31,7 @@
> #include <linux/module.h>
> #include <linux/kexec.h>
> #include <linux/pfn.h>
> +#include <linux/swap.h>
>
> #include <asm/e820.h>
> #include <asm/setup.h>
> @@ -97,15 +98,8 @@ unsigned long node_memmap_size_bytes(int nid, unsigned long start_pfn,
> #endif
>
> extern unsigned long find_max_low_pfn(void);
> -extern void find_max_pfn(void);
> extern void add_one_highpage_init(struct page *, int, int);
>
> -extern struct e820map e820;
> -extern unsigned long highend_pfn, highstart_pfn;
> -extern unsigned long max_low_pfn;
> -extern unsigned long totalram_pages;
> -extern unsigned long totalhigh_pages;
> -
> #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE)
>
> unsigned long node_remap_start_pfn[MAX_NUMNODES];
> @@ -360,7 +354,9 @@ void __init zone_sizes_init(void)
> max_zone_pfns[ZONE_DMA] =
> virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT;
> max_zone_pfns[ZONE_NORMAL] = max_low_pfn;
> +#ifdef CONFIG_HIGHMEM
> max_zone_pfns[ZONE_HIGHMEM] = highend_pfn;
> +#endif
>
> /* If SRAT has not registered memory, register it now */
> if (find_max_pfn_with_active_regions() == 0) {
>