diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-03-31 23:02:19 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-03-31 23:02:19 -0800 |
| commit | 647068866efb4e28156dc32eebc56d9ea1068efc (patch) | |
| tree | 25e56da9e2b6e234861f75504319f2de89c4fc03 /include | |
| parent | 4a10600a7ac8b8f4128b65b690987d7cc0769475 (diff) | |
| parent | 8660e3d9a6f9fe448d17cfe84efead6c101f60d3 (diff) | |
Merge bk://linux-acpi.bkbits.net/linux-acpi-release-2.6.5
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-i386/acpi.h | 9 | ||||
| -rw-r--r-- | include/asm-i386/system.h | 5 |
2 files changed, 1 insertions, 13 deletions
diff --git a/include/asm-i386/acpi.h b/include/asm-i386/acpi.h index b303c70f8887..2a4b35f628fd 100644 --- a/include/asm-i386/acpi.h +++ b/include/asm-i386/acpi.h @@ -54,15 +54,6 @@ #define ACPI_ENABLE_IRQS() local_irq_enable() #define ACPI_FLUSH_CPU_CACHE() wbinvd() -/* - * A brief explanation as GNU inline assembly is a bit hairy - * %0 is the output parameter in EAX ("=a") - * %1 and %2 are the input parameters in ECX ("c") - * and an immediate value ("i") respectively - * All actual register references are preceded with "%%" as in "%%edx" - * Immediate values in the assembly are preceded by "$" as in "$0x1" - * The final asm parameter are the operation altered non-output registers. - */ static inline int __acpi_acquire_global_lock (unsigned int *lock) diff --git a/include/asm-i386/system.h b/include/asm-i386/system.h index 909ba6a3a9c8..6b1d2e84a20d 100644 --- a/include/asm-i386/system.h +++ b/include/asm-i386/system.h @@ -241,6 +241,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int siz #ifdef CONFIG_X86_CMPXCHG #define __HAVE_ARCH_CMPXCHG 1 +#endif static inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old, unsigned long new, int size) @@ -273,10 +274,6 @@ static inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old, ((__typeof__(*(ptr)))__cmpxchg((ptr),(unsigned long)(o),\ (unsigned long)(n),sizeof(*(ptr)))) -#else -/* Compiling for a 386 proper. Is it worth implementing via cli/sti? */ -#endif - #ifdef __KERNEL__ struct alt_instr { __u8 *instr; /* original instruction */ |