Commit 0f8133a8 authored by Andrey Panin's avatar Andrey Panin Committed by Linus Torvalds
Browse files

[PATCH] dmi: move ACPI sleep quirk 



This patch moves ACPI sleep quirk out of dmi_scan.c

Signed-off-by: default avatarAndrey Panin <pazke@donpac.ru>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent aea00143

arch/i386/kernel/acpi/boot.c

+1 −0
Original line number Diff line number Diff line
@@ -1024,6 +1024,7 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = { 
		},

	},

#endif

	{ }

};



#endif	/* __i386__ */

arch/i386/kernel/acpi/sleep.c

+27 −0
Original line number Diff line number Diff line
@@ -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,29 @@ static int __init acpi_sleep_setup(char *str) 




__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);

arch/i386/kernel/dmi_scan.c

+0 −16
Original line number Diff line number Diff line
@@ -177,16 +177,6 @@ static __init int broken_toshiba_keyboard(struct dmi_blacklist *d) 
}





#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 dmi_blacklist[]={ 
			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, }

};