AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

Pull osi into release branch

Browse Source
This commit is contained in:
Len Brown 2007-07-22 02:29:41 -04:00
commit b4b613fd83
2 changed files with 9 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
drivers/acpi/osl.c
View File

@ -77,13 +77,7 @@ static struct workqueue_struct *kacpi_notify_wq;
#define OSI_STRING_LENGTH_MAX 64 /* arbitrary */ #define OSI_STRING_LENGTH_MAX 64 /* arbitrary */
static char osi_additional_string[OSI_STRING_LENGTH_MAX]; static char osi_additional_string[OSI_STRING_LENGTH_MAX];
#define OSI_LINUX_ENABLED static int osi_linux; /* disable _OSI(Linux) by default */
#ifdef OSI_LINUX_ENABLED
int osi_linux = 1; /* enable _OSI(Linux) by default */
#else
int osi_linux; /* disable _OSI(Linux) by default */
#endif
#ifdef CONFIG_DMI #ifdef CONFIG_DMI
static struct __initdata dmi_system_id acpi_osl_dmi_table[]; static struct __initdata dmi_system_id acpi_osl_dmi_table[];
@ -1183,17 +1177,10 @@ acpi_os_validate_interface (char *interface)
if (!strcmp("Linux", interface)) { if (!strcmp("Linux", interface)) {
printk(KERN_WARNING PREFIX printk(KERN_WARNING PREFIX
"System BIOS is requesting _OSI(Linux)\n"); "System BIOS is requesting _OSI(Linux)\n");
#ifdef OSI_LINUX_ENABLED
printk(KERN_WARNING PREFIX
"Please test with \"acpi_osi=!Linux\"\n"
"Please send dmidecode "
"to linux-acpi@vger.kernel.org\n");
#else
printk(KERN_WARNING PREFIX printk(KERN_WARNING PREFIX
"If \"acpi_osi=Linux\" works better,\n" "If \"acpi_osi=Linux\" works better,\n"
"Please send dmidecode " "Please send dmidecode "
"to linux-acpi@vger.kernel.org\n"); "to linux-acpi@vger.kernel.org\n");
#endif
if(osi_linux) if(osi_linux)
return AE_OK; return AE_OK;
} }
@ -1227,36 +1214,14 @@ acpi_os_validate_address (
} }
#ifdef CONFIG_DMI #ifdef CONFIG_DMI
#ifdef OSI_LINUX_ENABLED
static int dmi_osi_not_linux(struct dmi_system_id *d)
{
printk(KERN_NOTICE "%s detected: requires not _OSI(Linux)\n", d->ident);
enable_osi_linux(0);
return 0;
}
#else
static int dmi_osi_linux(struct dmi_system_id *d) static int dmi_osi_linux(struct dmi_system_id *d)
{ {
printk(KERN_NOTICE "%s detected: requires _OSI(Linux)\n", d->ident); printk(KERN_NOTICE "%s detected: enabling _OSI(Linux)\n", d->ident);
enable_osi_linux(1); enable_osi_linux(1);
return 0; return 0;
} }
#endif
static struct dmi_system_id acpi_osl_dmi_table[] __initdata = { static struct dmi_system_id acpi_osl_dmi_table[] __initdata = {
#ifdef OSI_LINUX_ENABLED
/*
* Boxes that need NOT _OSI(Linux)
*/
{
.callback = dmi_osi_not_linux,
.ident = "Toshiba Satellite P100",
.matches = {
DMI_MATCH(DMI_BOARD_VENDOR, "TOSHIBA"),
DMI_MATCH(DMI_BOARD_NAME, "Satellite P100"),
},
},
#else
/* /*
* Boxes that need _OSI(Linux) * Boxes that need _OSI(Linux)
*/ */
@ -1268,7 +1233,6 @@ static struct dmi_system_id acpi_osl_dmi_table[] __initdata = {
DMI_MATCH(DMI_BOARD_NAME, "MPAD-MSAE Customer Reference Boards"), DMI_MATCH(DMI_BOARD_NAME, "MPAD-MSAE Customer Reference Boards"),
}, },
}, },
#endif
{} {}
}; };
#endif /* CONFIG_DMI */ #endif /* CONFIG_DMI */

17
drivers/acpi/utilities/uteval.c
View File

@ -62,16 +62,13 @@ acpi_ut_translate_one_cid(union acpi_operand_object *obj_desc,
static char *acpi_interfaces_supported[] = { static char *acpi_interfaces_supported[] = {
/* Operating System Vendor Strings */ /* Operating System Vendor Strings */
"Windows 2000", "Windows 2000", /* Windows 2000 */
"Windows 2001", "Windows 2001", /* Windows XP */
"Windows 2001 SP0", "Windows 2001 SP1", /* Windows XP SP1 */
"Windows 2001 SP1", "Windows 2001 SP2", /* Windows XP SP2 */
"Windows 2001 SP2", "Windows 2001.1", /* Windows Server 2003 */
"Windows 2001 SP3", "Windows 2001.1 SP1", /* Windows Server 2003 SP1 - Added 03/2006 */
"Windows 2001 SP4", "Windows 2006", /* Windows Vista - Added 03/2006 */
"Windows 2001.1",
"Windows 2001.1 SP1", /* Added 03/2006 */
"Windows 2006", /* Added 03/2006 */
/* Feature Group Strings */ /* Feature Group Strings */