From: Pavel Machek <pavel@ucw.cz>
To: Andrew Morton <akpm@zip.com.au>,
kernel list <linux-kernel@vger.kernel.org>
Subject: [patch] swsusp: kill config_pm_disk
Date: Thu, 21 Apr 2005 13:07:24 +0200 [thread overview]
Message-ID: <20050421110724.GA14328@elf.ucw.cz> (raw)
CONFIG_PM_DISK is long gone, but it still managed to survived at few
places.
Signed-off-by: Pavel Machek <pavel@suse.cz>
--- clean/arch/i386/mm/init.c 2005-03-19 00:31:06.000000000 +0100
+++ linux/arch/i386/mm/init.c 2005-03-25 09:08:37.000000000 +0100
@@ -352,7 +352,7 @@
#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.
--- clean/mm/page_io.c 2005-04-05 10:55:35.000000000 +0200
+++ linux/mm/page_io.c 2005-04-05 10:57:21.000000000 +0200
@@ -127,7 +127,7 @@
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.
--- clean/arch/i386/defconfig 2005-03-19 00:31:05.000000000 +0100
+++ linux/arch/i386/defconfig 2005-03-25 09:08:37.000000000 +0100
@@ -126,7 +126,6 @@
#
CONFIG_PM=y
CONFIG_SOFTWARE_SUSPEND=y
-# CONFIG_PM_DISK is not set
#
# ACPI (Advanced Configuration and Power Interface) Support
--
Boycott Kodak -- for their patent abuse against Java.
reply other threads:[~2005-04-21 11:19 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20050421110724.GA14328@elf.ucw.cz \
--to=pavel@ucw.cz \
--cc=akpm@zip.com.au \
--cc=linux-kernel@vger.kernel.org \
/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®