From: Andrey Panin <pazke@donpac.ru>
To: Andrew Morton <akpm@osdl.org>, linux-kernel@vger.kernel.org
Subject: [PATCH 2.6.12-rc4-mm1 1/3] DMI, move ACPI sleep quirk
Date: Sat, 14 May 2005 16:44:56 +0400 [thread overview]
Message-ID: <11160746962011@donpac.ru> (raw)
In-Reply-To: <11160746954181@donpac.ru>
This patch moves ACPI sleep quirk out of dmi_scan.c
Signed-off-by: Andrey Panin <pazke@donpac.ru>
arch/i386/kernel/acpi/sleep.c | 26 ++++++++++++++++++++++++++
arch/i386/kernel/dmi_scan.c | 16 ----------------
2 files changed, 26 insertions(+), 16 deletions(-)
diff -urdpNX dontdiff linux-2.6.12-rc4-mm1.vanilla/arch/i386/kernel/acpi/sleep.c linux-2.6.12-rc4-mm1/arch/i386/kernel/acpi/sleep.c
--- linux-2.6.12-rc4-mm1.vanilla/arch/i386/kernel/acpi/sleep.c 2005-05-04 14:00:09.000000000 +0400
+++ linux-2.6.12-rc4-mm1/arch/i386/kernel/acpi/sleep.c 2005-05-04 15:00:03.000000000 +0400
@@ -7,6 +7,7 @@
#include <linux/acpi.h>
#include <linux/bootmem.h>
+#include <linux/dmi.h>
#include <asm/smp.h>
#include <asm/tlbflush.h>
@@ -91,3 +92,28 @@ static int __init acpi_sleep_setup(char
__setup("acpi_sleep=", acpi_sleep_setup);
+
+
+static __init int reset_videomode_after_s3(struct dmi_system_id *d)
+{
+ acpi_video_flags |= 2;
+ return 0;
+}
+
+static __initdata struct dmi_system_id acpisleep_dmi_table[] = {
+ { /* Reset video mode after returning from ACPI S3 sleep */
+ .callback = reset_videomode_after_s3,
+ .ident = "Toshiba Satellite 4030cdt",
+ .matches = {
+ DMI_MATCH(DMI_PRODUCT_NAME, "S4030CDT/4.3"),
+ },
+ },
+};
+
+static int __init acpisleep_dmi_init(void)
+{
+ dmi_check_system(acpisleep_dmi_table);
+ return 0;
+}
+
+core_initcall(acpisleep_dmi_init);
diff -urdpNX dontdiff linux-2.6.12-rc4-mm1.vanilla/arch/i386/kernel/dmi_scan.c linux-2.6.12-rc4-mm1/arch/i386/kernel/dmi_scan.c
--- linux-2.6.12-rc4-mm1.vanilla/arch/i386/kernel/dmi_scan.c 2005-05-04 14:59:28.000000000 +0400
+++ linux-2.6.12-rc4-mm1/arch/i386/kernel/dmi_scan.c 2005-05-04 15:00:04.000000000 +0400
@@ -177,16 +177,6 @@ static __init int broken_toshiba_keyboar
}
-#ifdef CONFIG_ACPI_SLEEP
-static __init int reset_videomode_after_s3(struct dmi_blacklist *d)
-{
- /* See acpi_wakeup.S */
- extern long acpi_video_flags;
- acpi_video_flags |= 2;
- return 0;
-}
-#endif
-
/*
* Process the DMI blacklists
@@ -204,12 +194,6 @@ static __initdata struct dmi_blacklist d
MATCH(DMI_PRODUCT_NAME, "S4030CDT/4.3"),
NO_MATCH, NO_MATCH, NO_MATCH
} },
-#ifdef CONFIG_ACPI_SLEEP
- { reset_videomode_after_s3, "Toshiba Satellite 4030cdt", { /* Reset video mode after returning from ACPI S3 sleep */
- MATCH(DMI_PRODUCT_NAME, "S4030CDT/4.3"),
- NO_MATCH, NO_MATCH, NO_MATCH
- } },
-#endif
{ NULL, }
};
next prev parent reply other threads:[~2005-05-14 12:47 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-05-14 12:44 [PATCH 2.6.12-rc4-mm1 0/3] DMI, move ACPI boot quirk Andrey Panin
2005-05-14 12:44 ` Andrey Panin [this message]
2005-05-14 12:44 ` [PATCH 2.6.12-rc4-mm1 2/3] DMI, remove central blacklist Andrey Panin
2005-05-14 12:44 ` [PATCH 2.6.12-rc4-mm1 3/3] DMI code spring cleanup Andrey Panin
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=11160746962011@donpac.ru \
--to=pazke@donpac.ru \
--cc=akpm@osdl.org \
--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