aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2013-11-09 00:13:16 -0500
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-11-12 16:49:48 -0500
commit4c47cb197e136912f4eecc68ab9410487f2df831 (patch)
tree9a28f281737bd2824ef6aa769f8aad6ea3cbf499
parent5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52 (diff)
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: Len Brown <len.brown@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--drivers/acpi/Kconfig11
-rw-r--r--drivers/acpi/blacklist.c35
2 files changed, 0 insertions, 46 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 6efe2ac6902f..7e5c18a60541 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -251,17 +251,6 @@ config ACPI_INITRD_TABLE_OVERRIDE
251 initrd, therefore it's safe to say Y. 251 initrd, therefore it's safe to say Y.
252 See Documentation/acpi/initrd_table_override.txt for details 252 See Documentation/acpi/initrd_table_override.txt for details
253 253
254config ACPI_BLACKLIST_YEAR
255 int "Disable ACPI for systems before Jan 1st this year" if X86_32
256 default 0
257 help
258 Enter a 4-digit year, e.g., 2001, to disable ACPI by default
259 on platforms with DMI BIOS date before January 1st that year.
260 "acpi=force" can be used to override this mechanism.
261
262 Enter 0 to disable this mechanism and allow ACPI to
263 run by default no matter what the year. (default)
264
265config ACPI_DEBUG 254config ACPI_DEBUG
266 bool "Debug Statements" 255 bool "Debug Statements"
267 default n 256 default n
diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
index 9515f18898b2..a87958830849 100644
--- a/drivers/acpi/blacklist.c
+++ b/drivers/acpi/blacklist.c
@@ -75,39 +75,6 @@ static struct acpi_blacklist_item acpi_blacklist[] __initdata = {
75 {""} 75 {""}
76}; 76};
77 77
78#if CONFIG_ACPI_BLACKLIST_YEAR
79
80static int __init blacklist_by_year(void)
81{
82 int year;
83
84 /* Doesn't exist? Likely an old system */
85 if (!dmi_get_date(DMI_BIOS_DATE, &year, NULL, NULL)) {
86 printk(KERN_ERR PREFIX "no DMI BIOS year, "
87 "acpi=force is required to enable ACPI\n" );
88 return 1;
89 }
90 /* 0? Likely a buggy new BIOS */
91 if (year == 0) {
92 printk(KERN_ERR PREFIX "DMI BIOS year==0, "
93 "assuming ACPI-capable machine\n" );
94 return 0;
95 }
96 if (year < CONFIG_ACPI_BLACKLIST_YEAR) {
97 printk(KERN_ERR PREFIX "BIOS age (%d) fails cutoff (%d), "
98 "acpi=force is required to enable ACPI\n",
99 year, CONFIG_ACPI_BLACKLIST_YEAR);
100 return 1;
101 }
102 return 0;
103}
104#else
105static inline int blacklist_by_year(void)
106{
107 return 0;
108}
109#endif
110
111int __init acpi_blacklisted(void) 78int __init acpi_blacklisted(void)
112{ 79{
113 int i = 0; 80 int i = 0;
@@ -166,8 +133,6 @@ int __init acpi_blacklisted(void)
166 } 133 }
167 } 134 }
168 135
169 blacklisted += blacklist_by_year();
170
171 dmi_check_system(acpi_osi_dmi_table); 136 dmi_check_system(acpi_osi_dmi_table);
172 137
173 return blacklisted; 138 return blacklisted;