Pull misc-for-upstream into release branch (54b8c39f) · Commits · e / devices / android_kernel_xiaomi_markw

MAINTAINERS

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -3066,11 +3066,10 @@ L: netdev@vger.kernel.org
	S: Maintained		S: Maintained

	SONY VAIO CONTROL DEVICE DRIVER		SONY VAIO CONTROL DEVICE DRIVER
	P: Stelian Pop
	M: stelian@popies.net
	P: Mattia Dongili		P: Mattia Dongili
	M: malattia@linux.it		M: malattia@linux.it
	W: http://popies.net/sonypi/		L: linux-acpi@vger.kernel.org
			W: http://www.linux.it/~malattia/wiki/index.php/Sony_drivers
	S: Maintained		S: Maintained

	SOUND		SOUND

arch/ia64/Kconfig

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -13,6 +13,7 @@ config IA64
	bool		bool
	select PCI if (!IA64_HP_SIM)		select PCI if (!IA64_HP_SIM)
	select ACPI if (!IA64_HP_SIM)		select ACPI if (!IA64_HP_SIM)
			select PM if (!IA64_HP_SIM)
	default y		default y
	help		help
	The Itanium Processor Family is Intel's 64-bit successor to		The Itanium Processor Family is Intel's 64-bit successor to

drivers/acpi/hardware/hwsleep.c

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -300,6 +300,11 @@ acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state)
	/*		/*
	* 2) Enable all wakeup GPEs		* 2) Enable all wakeup GPEs
	*/		*/
			status = acpi_hw_disable_all_gpes();
			if (ACPI_FAILURE(status)) {
			return_ACPI_STATUS(status);
			}

	acpi_gbl_system_awake_and_running = FALSE;		acpi_gbl_system_awake_and_running = FALSE;

	status = acpi_hw_enable_all_wakeup_gpes();		status = acpi_hw_enable_all_wakeup_gpes();

drivers/acpi/ibm_acpi.c

+16 −3

Original line number	Original line	Diff line number	Diff line
	@@ -2507,7 +2507,7 @@ static int __init setup_notify(struct ibm_struct *ibm)
	ret = acpi_bus_get_device(*ibm->handle, &ibm->device);		ret = acpi_bus_get_device(*ibm->handle, &ibm->device);
	if (ret < 0) {		if (ret < 0) {
	printk(IBM_ERR "%s device not present\n", ibm->name);		printk(IBM_ERR "%s device not present\n", ibm->name);
	return 0;		return -ENODEV;
	}		}

	acpi_driver_data(ibm->device) = ibm;		acpi_driver_data(ibm->device) = ibm;
	@@ -2516,8 +2516,13 @@ static int __init setup_notify(struct ibm_struct *ibm)
	status = acpi_install_notify_handler(*ibm->handle, ibm->type,		status = acpi_install_notify_handler(*ibm->handle, ibm->type,
	dispatch_notify, ibm);		dispatch_notify, ibm);
	if (ACPI_FAILURE(status)) {		if (ACPI_FAILURE(status)) {
			if (status == AE_ALREADY_EXISTS) {
			printk(IBM_NOTICE "another device driver is already handling %s events\n",
			ibm->name);
			} else {
	printk(IBM_ERR "acpi_install_notify_handler(%s) failed: %d\n",		printk(IBM_ERR "acpi_install_notify_handler(%s) failed: %d\n",
	ibm->name, status);		ibm->name, status);
			}
	return -ENODEV;		return -ENODEV;
	}		}
	ibm->notify_installed = 1;		ibm->notify_installed = 1;
	@@ -2553,6 +2558,8 @@ static int __init register_driver(struct ibm_struct *ibm)
	return ret;		return ret;
	}		}

			static void ibm_exit(struct ibm_struct *ibm);

	static int __init ibm_init(struct ibm_struct *ibm)		static int __init ibm_init(struct ibm_struct *ibm)
	{		{
	int ret;		int ret;
	@@ -2594,6 +2601,12 @@ static int __init ibm_init(struct ibm_struct *ibm)

	if (ibm->notify) {		if (ibm->notify) {
	ret = setup_notify(ibm);		ret = setup_notify(ibm);
			if (ret == -ENODEV) {
			printk(IBM_NOTICE "disabling subdriver %s\n",
			ibm->name);
			ibm_exit(ibm);
			return 0;
			}
	if (ret < 0)		if (ret < 0)
	return ret;		return ret;
	}		}

include/acpi/actypes.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -344,7 +344,7 @@ typedef u32 acpi_integer;

	/* 64-bit integers */		/* 64-bit integers */

	typedef u64 acpi_integer;		typedef unsigned long long acpi_integer;
	#define ACPI_INTEGER_MAX ACPI_UINT64_MAX		#define ACPI_INTEGER_MAX ACPI_UINT64_MAX
	#define ACPI_INTEGER_BIT_SIZE 64		#define ACPI_INTEGER_BIT_SIZE 64
	#define ACPI_MAX_DECIMAL_DIGITS 20 /* 2^64 = 18,446,744,073,709,551,616 */		#define ACPI_MAX_DECIMAL_DIGITS 20 /* 2^64 = 18,446,744,073,709,551,616 */