Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S263130AbUJ2H1a (ORCPT ); Fri, 29 Oct 2004 03:27:30 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S263129AbUJ2H12 (ORCPT ); Fri, 29 Oct 2004 03:27:28 -0400 Received: from [192.55.52.67] ([192.55.52.67]:21935 "EHLO fmsfmr001.fm.intel.com") by vger.kernel.org with ESMTP id S263124AbUJ2HZd (ORCPT ); Fri, 29 Oct 2004 03:25:33 -0400 Date: Fri, 29 Oct 2004 15:07:51 +0800 (CST) From: "Zhu, Yi" X-X-Sender: chuyee@mazda.sh.intel.com Reply-To: "Zhu, Yi" To: Andrew Morton cc: Pavel Machek , Shaohua Li , Linux Kernel Mailing List Subject: RE: [PATCH] [swsusp] print error message when swapping is disabled In-Reply-To: <16A54BF5D6E14E4D916CE26C9AD3057563D61B@pdsmsx402.ccr.corp.intel.com> Message-ID: 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: 1110 Lines: 34 On Tue, 26 Oct 2004, Li, Shaohua wrote: > Another case is PSE disabled. Should notify this to user also. Here is a patch to address it. Thanks, -yi Signed-off-by: Zhu Yi diff -urp linux-2.6.10-rc1-orig/include/asm-i386/suspend.h linux-2.6.10-rc1/include/asm-i386/suspend.h --- linux-2.6.10-rc1-orig/include/asm-i386/suspend.h 2004-10-29 14:11:44.000000000 +0800 +++ linux-2.6.10-rc1/include/asm-i386/suspend.h 2004-10-29 14:14:41.000000000 +0800 @@ -12,8 +12,11 @@ arch_prepare_suspend(void) /* If you want to make non-PSE machine work, turn off paging in do_magic. swsusp_pg_dir should have identity mapping, so it could work... */ - if (!cpu_has_pse) + if (!cpu_has_pse) { + printk(KERN_ERR "swsusp: FATAL: PSE is not availiable or " + "disabled on your system!\n"); return -EPERM; + } return 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/