On Thursday, January 22, 2015 05:44:44 PM al.stone@xxxxxxxxxx wrote: > From: Hanjun Guo <hanjun.guo@xxxxxxxxxx> > > 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>". > > Signed-off-by: Hanjun Guo <hanjun.guo@xxxxxxxxxx> > --- > arch/arm64/Kconfig | 1 + > drivers/acpi/Kconfig | 8 ++++++++ > include/acpi/acconfig.h | 2 ++ > include/acpi/platform/aclinux.h | 4 ++++ > 4 files changed, 15 insertions(+) > > diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig > index 915aa16..20677d1 100644 > --- a/arch/arm64/Kconfig > +++ b/arch/arm64/Kconfig > @@ -1,5 +1,6 @@ If you added config ACPI_OS_NAME string default "Linux" depends on ACPI to this file, then you don't need to add the new select below and -> > config ARM64 > def_bool y > + select ACPI_OS_NAME_LINUX if ACPI > select ACPI_REDUCED_HARDWARE_ONLY if ACPI > select ARCH_BINFMT_ELF_RANDOMIZE_PIE > select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE > diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig > index 3e3bd35..024c5f0 100644 > --- a/drivers/acpi/Kconfig > +++ b/drivers/acpi/Kconfig > @@ -369,6 +369,14 @@ config ACPI_REDUCED_HARDWARE_ONLY > > If you are unsure what to do, do not enable this option. > > +config ACPI_OS_NAME_LINUX > + bool "Using Linux for _OS method" if EXPERT > + def_bool n > + When used, this option makes sure the _OS method returns > + the value "Linux". > + > + If you are unsure what to do, do not enable this option. > + -> you don't need this at all ->> > source "drivers/acpi/apei/Kconfig" > > config ACPI_EXTLOG > diff --git a/include/acpi/acconfig.h b/include/acpi/acconfig.h > index 5a0a3e5..1980bf4 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 1ba7c19..a8a7ee3 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_LINUX > +#define ACPI_OS_NAME "Linux" > +#endif ->> and here you can do +#ifdef CONFIG_ACPI_OS_NAME +#define ACPI_OS_NAME CONFIG_ACPI_OS_NAME +#endif unless I'm missing something. > + > #include <linux/string.h> > #include <linux/kernel.h> > #include <linux/ctype.h> > -- I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center. -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
