Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id ; Fri, 15 Nov 2002 03:04:27 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id ; Fri, 15 Nov 2002 03:04:26 -0500 Received: from orion.netbank.com.br ([200.203.199.90]:49677 "EHLO orion.netbank.com.br") by vger.kernel.org with ESMTP id ; Fri, 15 Nov 2002 03:04:02 -0500 Date: Fri, 15 Nov 2002 06:10:44 -0200 From: Arnaldo Carvalho de Melo To: pavel@suse.cz, Linus Torvalds Cc: Linux Kernel Mailing List Subject: [PATCH] swsuspend and CONFIG_DISCONTIGMEM=y Message-ID: <20021115081044.GI18180@conectiva.com.br> Mail-Followup-To: Arnaldo Carvalho de Melo , pavel@suse.cz, Linus Torvalds , Linux Kernel Mailing List Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4i X-Url: http://advogato.org/person/acme Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3178 Lines: 84 i686 -Iarch/i386/mach-generic -nostdinc -iwithprefix include -DKBUILD_BASENAME=suspend -DKBUILD_MODNAME=suspend -DEXPORT_SYMTAB -c -o kernel/suspend.o kernel/suspend.c kernel/suspend.c:295: warning: #warning This might be broken. We need to somehow wait for data to reach the disk kernel/suspend.c: In function `free_some_memory': kernel/suspend.c:627: `contig_page_data' undeclared (first use in this function) kernel/suspend.c:627: (Each undeclared identifier is reported only once kernel/suspend.c:627: for each function it appears in.) make[1]: ** [kernel/suspend.o] Erro 1 make: ** [kernel] Erro 2 [acme@oops hell_header-2.5]$ grep CONFIG_DISCONTIGMEM .config CONFIG_DISCONTIGMEM=y and in ./mm/page_alloc.c #ifndef CONFIG_DISCONTIGMEM static bootmem_data_t contig_bootmem_data; struct pglist_data contig_page_data = { .bdata = &contig_bootmem_data }; void __init free_area_init(unsigned long *zones_size) { free_area_init_node(0, &contig_page_data, NULL, zones_size, 0, NULL); mem_map = contig_page_data.node_mem_map; } #endif So perhaps the following patch is in order? Its kind of brute force, disabling it altogether, but it at least fixes it for now. You can import this changeset into BK by piping this whole message to: '| bk receive [path to repository]' or apply the patch as usual. =================================================================== ChangeSet@1.851, 2002-11-15 06:07:56-02:00, acme@conectiva.com.br o swsusp: depends on CONFIG_DISCONTIGMEM=n Kconfig | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) diff -Nru a/arch/i386/Kconfig b/arch/i386/Kconfig --- a/arch/i386/Kconfig Fri Nov 15 06:09:18 2002 +++ b/arch/i386/Kconfig Fri Nov 15 06:09:18 2002 @@ -1518,7 +1518,7 @@ config SOFTWARE_SUSPEND bool "Software Suspend (EXPERIMENTAL)" - depends on EXPERIMENTAL && PM + depends on EXPERIMENTAL && PM && !DISCONTIGMEM ---help--- Enable the possibilty of suspendig machine. It doesn't need APM. You may suspend your machine by 'swsusp' or 'shutdown -z