Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
ACPI: IA64=y ACPI=n build fix
ACPI: Kill overly verbose "power state" log messages
ACPI: fix Compaq Evo N800c (Pentium 4m) boot hang regression
ACPI: Clarify resource conflict message
thinkpad-acpi: fix CONFIG_THINKPAD_ACPI_HOTKEY_POLL build problem
+12
-9
+2
arch/ia64/include/asm/acpi.h
+2
arch/ia64/include/asm/acpi.h
···
89
89
#define ACPI_RELEASE_GLOBAL_LOCK(facs, Acq) \
90
90
((Acq) = ia64_acpi_release_global_lock(&facs->global_lock))
91
91
92
+
#ifdef CONFIG_ACPI
92
93
#define acpi_disabled 0 /* ACPI always enabled on IA64 */
93
94
#define acpi_noirq 0 /* ACPI always enabled on IA64 */
94
95
#define acpi_pci_disabled 0 /* ACPI PCI always enabled on IA64 */
95
96
#define acpi_strict 1 /* no ACPI spec workarounds on IA64 */
97
+
#endif
96
98
#define acpi_processor_cstate_check(x) (x) /* no idle limits on IA64 :) */
97
99
static inline void disable_acpi(void) { }
98
100
+1
-1
arch/x86/kernel/acpi/cstate.c
+1
-1
arch/x86/kernel/acpi/cstate.c
···
48
48
* P4, Core and beyond CPUs
49
49
*/
50
50
if (c->x86_vendor == X86_VENDOR_INTEL &&
51
-
(c->x86 > 0x6 || (c->x86 == 6 && c->x86_model >= 14)))
51
+
(c->x86 > 0xf || (c->x86 == 6 && c->x86_model >= 14)))
52
52
flags->bm_control = 0;
53
53
}
54
54
EXPORT_SYMBOL(acpi_processor_power_init_bm_check);
+7
-1
drivers/acpi/osl.c
+7
-1
drivers/acpi/osl.c
···
1161
1161
res_list_elem->name,
1162
1162
(long long) res_list_elem->start,
1163
1163
(long long) res_list_elem->end);
1164
-
printk(KERN_INFO "ACPI: Device needs an ACPI driver\n");
1164
+
if (acpi_enforce_resources == ENFORCE_RESOURCES_LAX)
1165
+
printk(KERN_NOTICE "ACPI: This conflict may"
1166
+
" cause random problems and system"
1167
+
" instability\n");
1168
+
printk(KERN_INFO "ACPI: If an ACPI driver is available"
1169
+
" for this device, you should use it instead of"
1170
+
" the native driver\n");
1165
1171
}
1166
1172
if (acpi_enforce_resources == ENFORCE_RESOURCES_STRICT)
1167
1173
return -EBUSY;
-7
drivers/acpi/processor_idle.c
-7
drivers/acpi/processor_idle.c
···
1214
1214
acpi_processor_setup_cpuidle(pr);
1215
1215
if (cpuidle_register_device(&pr->power.dev))
1216
1216
return -EIO;
1217
-
1218
-
printk(KERN_INFO PREFIX "CPU%d (power states:", pr->id);
1219
-
for (i = 1; i <= pr->power.count; i++)
1220
-
if (pr->power.states[i].valid)
1221
-
printk(" C%d[C%d]", i,
1222
-
pr->power.states[i].type);
1223
-
printk(")\n");
1224
1217
}
1225
1218
#ifdef CONFIG_ACPI_PROCFS
1226
1219
/* 'power' [R] */
+2
drivers/platform/x86/thinkpad_acpi.c
+2
drivers/platform/x86/thinkpad_acpi.c
···
2235
2235
2236
2236
HOTKEY_CONFIG_CRITICAL_START
2237
2237
hotkey_driver_mask = mask;
2238
+
#ifdef CONFIG_THINKPAD_ACPI_HOTKEY_POLL
2238
2239
hotkey_source_mask |= (mask & ~hotkey_all_mask);
2240
+
#endif
2239
2241
HOTKEY_CONFIG_CRITICAL_END
2240
2242
2241
2243
rc = hotkey_mask_set((hotkey_acpi_mask | hotkey_driver_mask) &