Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c47cb19 authored by Len Brown's avatar Len Brown Committed by Rafael J. Wysocki
Browse files

ACPI: delete CONFIG_ACPI_BLACKLIST_YEAR 



About 10 years ago, this option was created to help
distros enable ACPI and not get distracted by ACPI
BIOS issues in machines which were deemed old
at that time, eg 1999 and earlier.

After a couple of years, the high volume distros
stopped bothering to set this option, and instead
simply ran in ACPI mode on all systems with an
ACPI BIOS -- regardless of BIOS DMI year.

Recently there have been some ACPI-enabled systems
with no DMI, mandating that CONFIG_ACPI_BLACKLIST_YEAR=0.

So it seems vanishingly unlikely that this option
is helping anybody run a 2013 kernel on a 1998 system,
and now more systems mandate this option be disabled,
so we simplify by deleting it entirely.

Signed-off-by: default avatarLen Brown <len.brown@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 5e01dc7b

drivers/acpi/Kconfig

+0 −11
Original line number Diff line number Diff line
@@ -251,17 +251,6 @@ config ACPI_INITRD_TABLE_OVERRIDE 
	  initrd, therefore it's safe to say Y.

	  See Documentation/acpi/initrd_table_override.txt for details



config ACPI_BLACKLIST_YEAR

	int "Disable ACPI for systems before Jan 1st this year" if X86_32

	default 0

	help

	  Enter a 4-digit year, e.g., 2001, to disable ACPI by default

	  on platforms with DMI BIOS date before January 1st that year.

	  "acpi=force" can be used to override this mechanism.



	  Enter 0 to disable this mechanism and allow ACPI to

	  run by default no matter what the year.  (default)



config ACPI_DEBUG

	bool "Debug Statements"

	default n

drivers/acpi/blacklist.c

+0 −35
Original line number Diff line number Diff line
@@ -75,39 +75,6 @@ static struct acpi_blacklist_item acpi_blacklist[] __initdata = { 
	{""}

};



#if	CONFIG_ACPI_BLACKLIST_YEAR



static int __init blacklist_by_year(void)

{

	int year;



	/* Doesn't exist? Likely an old system */

	if (!dmi_get_date(DMI_BIOS_DATE, &year, NULL, NULL)) {

		printk(KERN_ERR PREFIX "no DMI BIOS year, "

			"acpi=force is required to enable ACPI\n" );

		return 1;

	}

	/* 0? Likely a buggy new BIOS */

	if (year == 0) {

		printk(KERN_ERR PREFIX "DMI BIOS year==0, "

			"assuming ACPI-capable machine\n" );

		return 0;

	}

	if (year < CONFIG_ACPI_BLACKLIST_YEAR) {

		printk(KERN_ERR PREFIX "BIOS age (%d) fails cutoff (%d), "

		       "acpi=force is required to enable ACPI\n",

		       year, CONFIG_ACPI_BLACKLIST_YEAR);

		return 1;

	}

	return 0;

}

#else

static inline int blacklist_by_year(void)

{

	return 0;

}

#endif



int __init acpi_blacklisted(void)

{

	int i = 0;
@@ -166,8 +133,6 @@ int __init acpi_blacklisted(void) 
		}

	}



	blacklisted += blacklist_by_year();



	dmi_check_system(acpi_osi_dmi_table);



	return blacklisted;