diff options
| author | Al Stone <ahs3@redhat.com> | 2015-01-23 17:57:44 -0700 |
|---|---|---|
| committer | Al Stone <ahs3@redhat.com> | 2015-02-02 11:05:17 -0700 |
| commit | e01bbcc45a5b3aa542cebe1847fb659b4ac7fa57 (patch) | |
| tree | b603a37c700f91afe3f6a58f9a9b3de8aad65e75 | |
| parent | e14f87e18fd5bb99c35d6b94326e3c246b82c277 (diff) | |
ACPI: arm64: use "Linux" as ACPI_OS_NAME for _OS on arm64acpi-osi-v2
ACPI_OS_NAME is globally defined as "Microsoft Windows NT" for now.
That doesn't make much sense in the ARM context, so set it to "Linux"
when CONFIG_ARM64.
If it is necessary to change the return value from \_OS_ (that is, return
some value other than the default in ACPI_OS_NAME), use the kernel parameter
"acpi_os_name=<string>".
Many thanks to Rafael Wysocki for this greatly simplified form of the patch.
Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
Signed-off-by: Al Stone <al.stone@linaro.org>
| -rw-r--r-- | arch/arm64/Kconfig | 5 | ||||
| -rw-r--r-- | include/acpi/acconfig.h | 2 | ||||
| -rw-r--r-- | include/acpi/platform/aclinux.h | 4 |
3 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index d01d3f7c285c..9a13d281cd34 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -88,6 +88,11 @@ config ARM64 config 64BIT def_bool y +config ACPI_OS_NAME + string + default "Linux" + depends on ACPI + config ARCH_PHYS_ADDR_T_64BIT def_bool y diff --git a/include/acpi/acconfig.h b/include/acpi/acconfig.h index 5a0a3e5daf85..1980bf47127b 100644 --- a/include/acpi/acconfig.h +++ b/include/acpi/acconfig.h @@ -69,7 +69,9 @@ * code that will not execute the _OSI method unless _OS matches the string * below. Therefore, change this string at your own risk. */ +#ifndef ACPI_OS_NAME #define ACPI_OS_NAME "Microsoft Windows NT" +#endif /* Maximum objects in the various object caches */ diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h index 1ba7c190c2cc..a871cdd6d79e 100644 --- a/include/acpi/platform/aclinux.h +++ b/include/acpi/platform/aclinux.h @@ -69,6 +69,10 @@ #define ACPI_REDUCED_HARDWARE 1 #endif +#ifdef CONFIG_ACPI_OS_NAME +#define ACPI_OS_NAME CONFIG_ACPI_OS_NAME +#endif + #include <linux/string.h> #include <linux/kernel.h> #include <linux/ctype.h> |