Commit 7eea5b89 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:
  leds-hp-disk: fix build warning
  ACPI: Oops in ACPI with git latest
  ACPI suspend: build fix for ACPI_SLEEP=n && XEN_SAVE_RESTORE=y.
  toshiba_acpi: always call input_sync() after input_report_switch()
  ACPI: Always report a sync event after a lid state change
  ACPI: cpufreq, processor: fix compile error in drivers/acpi/processor_perflib.c
  i7300_idle: Fix compile warning CONFIG_I7300_IDLE_IOAT_CHANNEL not defined
  i7300_idle: Cleanup based review comments
  i7300_idle: Disable ioat channel only on platforms where ile driver can load
parents 0173a326 9fb3c5ca

drivers/acpi/button.c

+2 −1
Original line number Diff line number Diff line
@@ -262,6 +262,7 @@ static int acpi_lid_send_state(struct acpi_button *button) 
		return -ENODEV;

	/* input layer checks if event is redundant */

	input_report_switch(button->input, SW_LID, !state);

	input_sync(button->input);

	return 0;

}
@@ -285,8 +286,8 @@ static void acpi_button_notify(acpi_handle handle, u32 event, void *data) 
			input_report_key(input, keycode, 1);

			input_sync(input);

			input_report_key(input, keycode, 0);

		}

			input_sync(input);

		}



		acpi_bus_generate_proc_event(button->device, event,

					++button->pushed);

drivers/acpi/processor_perflib.c

+5 −0
Original line number Diff line number Diff line
@@ -38,7 +38,10 @@ 


#include <asm/uaccess.h>

#endif



#ifdef CONFIG_X86

#include <asm/cpufeature.h>

#endif



#include <acpi/acpi_bus.h>

#include <acpi/processor.h>
@@ -360,11 +363,13 @@ static int acpi_processor_get_performance_info(struct acpi_processor *pr) 
	 * the BIOS is older than the CPU and does not know its frequencies

	 */

 update_bios:

#ifdef CONFIG_X86

	if (ACPI_SUCCESS(acpi_get_handle(pr->handle, "_PPC", &handle))){

		if(boot_cpu_has(X86_FEATURE_EST))

			printk(KERN_WARNING FW_BUG "BIOS needs update for CPU "

			       "frequency support\n");

	}

#endif

	return result;

}

drivers/acpi/sleep/main.c

+2 −0
Original line number Diff line number Diff line
@@ -163,6 +163,8 @@ static void acpi_pm_end(void) 
	acpi_target_sleep_state = ACPI_STATE_S0;

	acpi_sleep_tts_switch(acpi_target_sleep_state);

}

#else /* !CONFIG_ACPI_SLEEP */

#define acpi_target_sleep_state	ACPI_STATE_S0

#endif /* CONFIG_ACPI_SLEEP */



#ifdef CONFIG_SUSPEND

drivers/acpi/toshiba_acpi.c

+2 −0
Original line number Diff line number Diff line
@@ -371,6 +371,7 @@ static void bt_poll_rfkill(struct input_polled_dev *poll_dev) 
				   RFKILL_STATE_HARD_BLOCKED);

		input_report_switch(poll_dev->input, SW_RFKILL_ALL,

				    new_rfk_state);

		input_sync(poll_dev->input);

	}

}
@@ -842,6 +843,7 @@ static int __init toshiba_acpi_init(void) 
	set_bit(EV_SW, toshiba_acpi.poll_dev->input->evbit);

	set_bit(SW_RFKILL_ALL, toshiba_acpi.poll_dev->input->swbit);

	input_report_switch(toshiba_acpi.poll_dev->input, SW_RFKILL_ALL, TRUE);

	input_sync(toshiba_acpi.poll_dev->input);



	ret = input_register_polled_device(toshiba_acpi.poll_dev);

	if (ret) {

drivers/dma/ioat_dma.c

+5 −2
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <linux/delay.h>

#include <linux/dma-mapping.h>

#include <linux/workqueue.h>

#include <linux/i7300_idle.h>

#include "ioatdma.h"

#include "ioatdma_registers.h"

#include "ioatdma_hw.h"
@@ -171,8 +172,10 @@ static int ioat_dma_enumerate_channels(struct ioatdma_device *device) 
	xfercap_scale = readb(device->reg_base + IOAT_XFERCAP_OFFSET);

	xfercap = (xfercap_scale == 0 ? -1 : (1UL << xfercap_scale));



#if CONFIG_I7300_IDLE_IOAT_CHANNEL

#ifdef  CONFIG_I7300_IDLE_IOAT_CHANNEL

	if (i7300_idle_platform_probe(NULL, NULL) == 0) {

		device->common.chancnt--;

	}

#endif

	for (i = 0; i < device->common.chancnt; i++) {

		ioat_chan = kzalloc(sizeof(*ioat_chan), GFP_KERNEL);

CRA Git | Maintained and supported by SUSTech CRA and CCSE