Commit be0381cf authored by Jung-uk Kim's avatar Jung-uk Kim Committed by Rafael J. Wysocki
Browse files

ACPICA: Differentiate Windows 8.1 from Windows 8. 

ACPICA commit 66db7b38f61e63f11e48a0ea993d92b12e0a17ca

Link: https://github.com/acpica/acpica/commit/66db7b38


Signed-off-by: default avatarJung-uk Kim <jkim@free_BSD.org>
Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarErik Schmauss <erik.schmauss@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 36056d0c

drivers/acpi/acpica/utosi.c

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ static struct acpi_interface_info acpi_default_supported_interfaces[] = { 
	{"Windows 2006 SP2", NULL, 0, ACPI_OSI_WIN_VISTA_SP2},	/* Windows Vista SP2 - Added 09/2010 */

	{"Windows 2009", NULL, 0, ACPI_OSI_WIN_7},	/* Windows 7 and Server 2008 R2 - Added 09/2009 */

	{"Windows 2012", NULL, 0, ACPI_OSI_WIN_8},	/* Windows 8 and Server 2012 - Added 08/2012 */

	{"Windows 2013", NULL, 0, ACPI_OSI_WIN_8},	/* Windows 8.1 and Server 2012 R2 - Added 01/2014 */

	{"Windows 2013", NULL, 0, ACPI_OSI_WIN_8_1},	/* Windows 8.1 and Server 2012 R2 - Added 01/2014 */

	{"Windows 2015", NULL, 0, ACPI_OSI_WIN_10},	/* Windows 10 - Added 03/2015 */

	{"Windows 2016", NULL, 0, ACPI_OSI_WIN_10_RS1},	/* Windows 10 version 1607 - Added 12/2017 */

	{"Windows 2017", NULL, 0, ACPI_OSI_WIN_10_RS2},	/* Windows 10 version 1703 - Added 12/2017 */

include/acpi/actypes.h

+7 −6
Original line number Diff line number Diff line
@@ -1265,12 +1265,13 @@ typedef enum { 
#define ACPI_OSI_WIN_VISTA_SP2          0x0A

#define ACPI_OSI_WIN_7                  0x0B

#define ACPI_OSI_WIN_8                  0x0C

#define ACPI_OSI_WIN_10                 0x0D

#define ACPI_OSI_WIN_10_RS1             0x0E

#define ACPI_OSI_WIN_10_RS2             0x0F

#define ACPI_OSI_WIN_10_RS3             0x10

#define ACPI_OSI_WIN_10_RS4             0x11

#define ACPI_OSI_WIN_10_RS5             0x12

#define ACPI_OSI_WIN_8_1                0x0D

#define ACPI_OSI_WIN_10                 0x0E

#define ACPI_OSI_WIN_10_RS1             0x0F

#define ACPI_OSI_WIN_10_RS2             0x10

#define ACPI_OSI_WIN_10_RS3             0x11

#define ACPI_OSI_WIN_10_RS4             0x12

#define ACPI_OSI_WIN_10_RS5             0x13



/* Definitions of getopt */

CRA Git | Maintained and supported by SUSTech CRA and CCSE