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

Commit d0a9081b authored by Andrew Morton's avatar Andrew Morton Committed by Len Brown
Browse files

ACPI: uninline ACPI global locking functions 



- Fixes a build problem with CONFIG_M386=y (include file dependencies get
  messy).

- Share the implementation between x86 and x86_64

- These are too big to inline anyway.

Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 965a3d44

arch/i386/kernel/acpi/boot.c

+22 −0
Original line number Diff line number Diff line
@@ -1319,3 +1319,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;

}

include/asm-i386/acpi.h

+2 −24
Original line number Diff line number Diff line
@@ -56,30 +56,8 @@ 
#define ACPI_ENABLE_IRQS()  local_irq_enable()

#define ACPI_FLUSH_CPU_CACHE()	wbinvd()





static inline 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;

}



static inline 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;

}

int __acpi_acquire_global_lock(unsigned int *lock);

int __acpi_release_global_lock(unsigned int *lock);



#define ACPI_ACQUIRE_GLOBAL_LOCK(GLptr, Acq) \

	((Acq) = __acpi_acquire_global_lock((unsigned int *) GLptr))

include/asm-x86_64/acpi.h

+2 −24
Original line number Diff line number Diff line
@@ -54,30 +54,8 @@ 
#define ACPI_ENABLE_IRQS()  local_irq_enable()

#define ACPI_FLUSH_CPU_CACHE()	wbinvd()





static inline 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;

}



static inline 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;

}

int __acpi_acquire_global_lock(unsigned int *lock);

int __acpi_release_global_lock(unsigned int *lock);



#define ACPI_ACQUIRE_GLOBAL_LOCK(GLptr, Acq) \

	((Acq) = __acpi_acquire_global_lock((unsigned int *) GLptr))