Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932318AbWHaNxu (ORCPT ); Thu, 31 Aug 2006 09:53:50 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932322AbWHaNxu (ORCPT ); Thu, 31 Aug 2006 09:53:50 -0400 Received: from gprs189-60.eurotel.cz ([160.218.189.60]:12169 "EHLO amd.ucw.cz") by vger.kernel.org with ESMTP id S932318AbWHaNxt (ORCPT ); Thu, 31 Aug 2006 09:53:49 -0400 Date: Thu, 31 Aug 2006 15:53:36 +0200 From: Pavel Machek To: Andrew Morton , "Rafael J. Wysocki" , kernel list Subject: prevent swsusp with PAE Message-ID: <20060831135336.GL3923@elf.ucw.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Warning: Reading this can be dangerous to your mental health. User-Agent: Mutt/1.5.11+cvs20060126 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1568 Lines: 47 If HIGHMEM64G and swsusp are used at the same time, nasty random crashes happen during resume. Cause is known; prevent that combination. I guess I'd like to see this one in 2.6.18... Signed-off-by: Pavel Machek --- commit acb3b411ec93f827b25b8481d53670c5c9195d89 tree f52cd5518e34af16fe5ae28064717bcc95929f28 parent cd03e183c58e6e7073e054a7fe335cf50c61fe2f author Thu, 31 Aug 2006 15:52:34 +0200 committer Thu, 31 Aug 2006 15:52:34 +0200 include/asm-i386/suspend.h | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/include/asm-i386/suspend.h b/include/asm-i386/suspend.h index 08be1e5..01cd812 100644 --- a/include/asm-i386/suspend.h +++ b/include/asm-i386/suspend.h @@ -16,6 +16,15 @@ arch_prepare_suspend(void) printk(KERN_ERR "PSE is required for swsusp.\n"); return -EPERM; } + +#ifdef CONFIG_X86_PAE + printk(KERN_ERR "swsusp is incompatible with PAE.\n"); + /* This is actually instance of the same problem. We need + identity mapping self-contained in swsusp_pg_dir, and PAE + prevents that. Solution could be copied from x86_64. */ + return -EPERM; +#endif + return 0; } -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html - 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/