Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761508AbXEOEiX (ORCPT ); Tue, 15 May 2007 00:38:23 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756245AbXEOEiR (ORCPT ); Tue, 15 May 2007 00:38:17 -0400 Received: from smtp1.linux-foundation.org ([65.172.181.25]:41546 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756044AbXEOEiQ (ORCPT ); Tue, 15 May 2007 00:38:16 -0400 Date: Mon, 14 May 2007 21:38:03 -0700 (PDT) From: Linus Torvalds To: andrew hendry cc: Linux Kernel Mailing List Subject: Re: Linux 2.6.22-rc1 In-Reply-To: Message-ID: References: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=us-ascii Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1875 Lines: 61 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 #include #include +#include #include #include @@ -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) { - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/