linux-acpi.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Erik Schmauss <erik.schmauss@intel.com>
To: rjw@rjwysocki.net, linux-acpi@vger.kernel.org
Cc: Jung-uk Kim <jkim@free_BSD.org>,
	Bob Moore <robert.moore@intel.com>,
	Erik Schmauss <erik.schmauss@intel.com>
Subject: [PATCH 7/9] ACPICA: Differentiate Windows 8.1 from Windows 8.
Date: Fri, 16 Aug 2019 14:43:26 -0700	[thread overview]
Message-ID: <20190816214328.3900-8-erik.schmauss@intel.com> (raw)
In-Reply-To: <20190816214328.3900-1-erik.schmauss@intel.com>

From: Jung-uk Kim <jkim@free_BSD.org>

ACPICA commit 66db7b38f61e63f11e48a0ea993d92b12e0a17ca

Link: https://github.com/acpica/acpica/commit/66db7b38
Signed-off-by: Jung-uk Kim <jkim@free_BSD.org>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Erik Schmauss <erik.schmauss@intel.com>
---
 drivers/acpi/acpica/utosi.c |  2 +-
 include/acpi/actypes.h      | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/drivers/acpi/acpica/utosi.c b/drivers/acpi/acpica/utosi.c
index 688c61a90725..fc09d234fe62 100644
--- a/drivers/acpi/acpica/utosi.c
+++ b/drivers/acpi/acpica/utosi.c
@@ -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 */
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h
index f52c83eaedc4..10c10b9d18ae 100644
--- a/include/acpi/actypes.h
+++ b/include/acpi/actypes.h
@@ -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 */
 
-- 
2.17.2


  parent reply	other threads:[~2019-08-16 21:58 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-16 21:43 [PATCH 0/9] ACPICA 20190816 release Erik Schmauss
2019-08-16 21:43 ` [PATCH 1/9] ACPICA: Debugger: remove redundant assignment on obj_desc Erik Schmauss
2019-08-16 21:43 ` [PATCH 2/9] ACPICA: Increase total number of possible Owner IDs Erik Schmauss
2019-08-16 21:43 ` [PATCH 3/9] ACPICA: Macros: remove pointer math on a null pointer Erik Schmauss
2019-08-16 21:43 ` [PATCH 4/9] ACPICA: Fix issues with arg types within printf format strings Erik Schmauss
2019-08-16 21:43 ` [PATCH 5/9] ACPICA: iASL,acpi_dump: Improve y/n query Erik Schmauss
2019-08-16 21:43 ` [PATCH 6/9] ACPICA: Fully deploy ACPI_PRINTF_LIKE macro Macro was not being used across all "printf-like" functions. Also, cleanup all calls to such functions now that they are analyzed by the compiler (gcc). Both in 32-bit mode and 64-bit mode Erik Schmauss
2019-08-16 21:43 ` Erik Schmauss [this message]
2019-08-16 21:43 ` [PATCH 8/9] ACPICA: Add "Windows 2019" string to _OSI support Erik Schmauss
2019-08-16 21:43 ` [PATCH 9/9] ACPICA: Update version to 20190816 Erik Schmauss
2019-08-26  9:07 ` [PATCH 0/9] ACPICA 20190816 release Rafael J. Wysocki

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=20190816214328.3900-8-erik.schmauss@intel.com \
    --to=erik.schmauss@intel.com \
    --cc=jkim@free_BSD.org \
    --cc=linux-acpi@vger.kernel.org \
    --cc=rjw@rjwysocki.net \
    --cc=robert.moore@intel.com \
    /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;
as well as URLs for NNTP newsgroup(s).