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

Commit 73964f6b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 9d98ece1 e56d953d

arch/ia64/include/asm/acpi.h

+2 −0
Original line number Diff line number Diff line
@@ -89,10 +89,12 @@ ia64_acpi_release_global_lock (unsigned int *lock) 
#define ACPI_RELEASE_GLOBAL_LOCK(facs, Acq)				\

	((Acq) = ia64_acpi_release_global_lock(&facs->global_lock))



#ifdef	CONFIG_ACPI

#define acpi_disabled 0	/* ACPI always enabled on IA64 */

#define acpi_noirq 0	/* ACPI always enabled on IA64 */

#define acpi_pci_disabled 0 /* ACPI PCI always enabled on IA64 */

#define acpi_strict 1	/* no ACPI spec workarounds on IA64 */

#endif

#define acpi_processor_cstate_check(x) (x) /* no idle limits on IA64 :) */

static inline void disable_acpi(void) { }

arch/x86/kernel/acpi/cstate.c

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ void acpi_processor_power_init_bm_check(struct acpi_processor_flags *flags, 
	 * P4, Core and beyond CPUs

	 */

	if (c->x86_vendor == X86_VENDOR_INTEL &&

	    (c->x86 > 0x6 || (c->x86 == 6 && c->x86_model >= 14)))

	    (c->x86 > 0xf || (c->x86 == 6 && c->x86_model >= 14)))

			flags->bm_control = 0;

}

EXPORT_SYMBOL(acpi_processor_power_init_bm_check);

drivers/acpi/osl.c

+7 −1
Original line number Diff line number Diff line
@@ -1161,7 +1161,13 @@ int acpi_check_resource_conflict(struct resource *res) 
			       res_list_elem->name,

			       (long long) res_list_elem->start,

			       (long long) res_list_elem->end);

			printk(KERN_INFO "ACPI: Device needs an ACPI driver\n");

			if (acpi_enforce_resources == ENFORCE_RESOURCES_LAX)

				printk(KERN_NOTICE "ACPI: This conflict may"

				       " cause random problems and system"

				       " instability\n");

			printk(KERN_INFO "ACPI: If an ACPI driver is available"

			       " for this device, you should use it instead of"

			       " the native driver\n");

		}

		if (acpi_enforce_resources == ENFORCE_RESOURCES_STRICT)

			return -EBUSY;

drivers/acpi/processor_idle.c

+0 −7
Original line number Diff line number Diff line
@@ -1214,13 +1214,6 @@ int __cpuinit acpi_processor_power_init(struct acpi_processor *pr, 
		acpi_processor_setup_cpuidle(pr);

		if (cpuidle_register_device(&pr->power.dev))

			return -EIO;



		printk(KERN_INFO PREFIX "CPU%d (power states:", pr->id);

		for (i = 1; i <= pr->power.count; i++)

			if (pr->power.states[i].valid)

				printk(" C%d[C%d]", i,

				       pr->power.states[i].type);

		printk(")\n");

	}

#ifdef CONFIG_ACPI_PROCFS

	/* 'power' [R] */

drivers/platform/x86/thinkpad_acpi.c

+2 −0
Original line number Diff line number Diff line
@@ -2235,7 +2235,9 @@ static int tpacpi_hotkey_driver_mask_set(const u32 mask) 


	HOTKEY_CONFIG_CRITICAL_START

	hotkey_driver_mask = mask;

#ifdef CONFIG_THINKPAD_ACPI_HOTKEY_POLL

	hotkey_source_mask |= (mask & ~hotkey_all_mask);

#endif

	HOTKEY_CONFIG_CRITICAL_END



	rc = hotkey_mask_set((hotkey_acpi_mask | hotkey_driver_mask) &