From: Coywolf Qi Hunt <coywolf@sosdg.org>
To: pavel@suse.cz
Cc: linux-kernel@vger.kernel.org
Subject: [patch] remove CONFIG_PM_DISK
Date: Fri, 25 Mar 2005 03:03:30 -0500 [thread overview]
Message-ID: <20050325080330.GA1581@everest.sosdg.org> (raw)
Hello,
Pmdisk was merged in a few months ago. This removes CONFIG_PM_DISK
for conditional compilation.
Coywolf
Signed-off-by: Coywolf Qi Hunt <coywolf@lovecn.org>
---
diff -pruN 2.6.11-mm4/arch/i386/defconfig 2.6.11-mm4-cy/arch/i386/defconfig
--- 2.6.11-mm4/arch/i386/defconfig 2005-03-17 01:21:16.000000000 +0800
+++ 2.6.11-mm4-cy/arch/i386/defconfig 2005-03-20 02:24:48.000000000 +0800
@@ -126,7 +126,6 @@ CONFIG_HAVE_DEC_LOCK=y
#
CONFIG_PM=y
CONFIG_SOFTWARE_SUSPEND=y
-# CONFIG_PM_DISK is not set
#
# ACPI (Advanced Configuration and Power Interface) Support
diff -pruN 2.6.11-mm4/arch/i386/mm/init.c 2.6.11-mm4-cy/arch/i386/mm/init.c
--- 2.6.11-mm4/arch/i386/mm/init.c 2005-03-17 01:21:17.000000000 +0800
+++ 2.6.11-mm4-cy/arch/i386/mm/init.c 2005-03-20 02:41:26.000000000 +0800
@@ -352,7 +352,7 @@ static void __init pagetable_init (void)
#endif
}
-#if defined(CONFIG_PM_DISK) || defined(CONFIG_SOFTWARE_SUSPEND)
+#ifdef CONFIG_SOFTWARE_SUSPEND
/*
* Swap suspend & friends need this for resume because things like the intel-agp
* driver might have split up a kernel 4MB mapping.
diff -pruN 2.6.11-mm4/mm/page_io.c 2.6.11-mm4-cy/mm/page_io.c
--- 2.6.11-mm4/mm/page_io.c 2004-08-20 14:20:15.000000000 +0800
+++ 2.6.11-mm4-cy/mm/page_io.c 2005-03-20 02:36:54.000000000 +0800
@@ -127,7 +127,7 @@ out:
return ret;
}
-#if defined(CONFIG_SOFTWARE_SUSPEND) || defined(CONFIG_PM_DISK)
+#ifdef CONFIG_SOFTWARE_SUSPEND
/*
* A scruffy utility function to read or write an arbitrary swap page
* and wait on the I/O. The caller must have a ref on the page.
next reply other threads:[~2005-03-25 8:03 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-03-25 8:03 Coywolf Qi Hunt [this message]
2005-03-25 8:08 ` Pavel Machek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20050325080330.GA1581@everest.sosdg.org \
--to=coywolf@sosdg.org \
--cc=coywolf@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=pavel@suse.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®