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

Commit 463e7c7c authored by Len Brown's avatar Len Brown
Browse files

Pull trivial into test branch 

Conflicts:

	drivers/acpi/ec.c
parents 25c68a33 7d63c675

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -1397,6 +1397,15 @@ W: http://www.ia64-linux.org/ 
T:	git kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6.git

S:	Maintained



IBM ACPI EXTRAS DRIVER

P:	Henrique de Moraes Holschuh

M:	ibm-acpi@hmh.eng.br

L:	ibm-acpi-devel@lists.sourceforge.net

W:	http://ibm-acpi.sourceforge.net

W:	http://thinkwiki.org/wiki/Ibm-acpi

T:	git repo.or.cz/linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git

S:	Maintained



SN-IA64 (Itanium) SUB-PLATFORM

P:	Jes Sorensen

M:	jes@sgi.com

arch/i386/kernel/acpi/boot.c

+22 −0
Original line number Diff line number Diff line
@@ -1327,3 +1327,25 @@ static int __init setup_acpi_sci(char *s) 
	return 0;

}

early_param("acpi_sci", setup_acpi_sci);



int __acpi_acquire_global_lock(unsigned int *lock)

{

	unsigned int old, new, val;

	do {

		old = *lock;

		new = (((old & ~0x3) + 2) + ((old >> 1) & 0x1));

		val = cmpxchg(lock, old, new);

	} while (unlikely (val != old));

	return (new < 3) ? -1 : 0;

}



int __acpi_release_global_lock(unsigned int *lock)

{

	unsigned int old, new, val;

	do {

		old = *lock;

		new = old & ~0x3;

		val = cmpxchg(lock, old, new);

	} while (unlikely (val != old));

	return old & 0x1;

}

arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c

+1 −0
Original line number Diff line number Diff line
@@ -569,6 +569,7 @@ static int sw_any_bug_found(struct dmi_system_id *d) 
	return 0;

}



#ifdef CONFIG_SMP

static struct dmi_system_id sw_any_bug_dmi_table[] = {

	{

		.callback = sw_any_bug_found,

drivers/acpi/ec.c

+1 −1
Original line number Diff line number Diff line
@@ -367,7 +367,7 @@ int ec_write(u8 addr, u8 val) 


EXPORT_SYMBOL(ec_write);



extern int ec_transaction(u8 command,

int ec_transaction(u8 command,

			  const u8 * wdata, unsigned wdata_len,

			  u8 * rdata, unsigned rdata_len)

{

drivers/acpi/events/evmisc.c

+0 −1
Original line number Diff line number Diff line
@@ -331,7 +331,6 @@ static void ACPI_SYSTEM_XFACE acpi_ev_global_lock_thread(void *context) 
static u32 acpi_ev_global_lock_handler(void *context)

{

	u8 acquired = FALSE;

	acpi_status status;



	/*

	 * Attempt to get the lock