summaryrefslogtreecommitdiffstats
path: root/include/asm-i386/system.h
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2001-04-05 04:55:58 +0000
committerRalf Baechle <ralf@linux-mips.org>2001-04-05 04:55:58 +0000
commit74a9f2e1b4d3ab45a9f72cb5b556c9f521524ab3 (patch)
tree7c4cdb103ab1b388c9852a88bd6fb1e73eba0b5c /include/asm-i386/system.h
parentee6374c8b0d333c08061c6a97bc77090d7461225 (diff)
Merge with Linux 2.4.3.
Note that mingetty does no longer work with serial console, you have to switch to another getty like getty_ps. This commit also includes a fix for a setitimer bug which did prevent getty_ps from working on older kernels.
Diffstat (limited to 'include/asm-i386/system.h')
-rw-r--r--include/asm-i386/system.h17
1 files changed, 9 insertions, 8 deletions
diff --git a/include/asm-i386/system.h b/include/asm-i386/system.h
index 52e24682e..8da0ce326 100644
--- a/include/asm-i386/system.h
+++ b/include/asm-i386/system.h
@@ -144,16 +144,17 @@ struct __xchg_dummy { unsigned long a[100]; };
extern inline void __set_64bit (unsigned long long * ptr,
unsigned int low, unsigned int high)
{
-__asm__ __volatile__ (
- "1: movl (%0), %%eax;
- movl 4(%0), %%edx;
- cmpxchg8b (%0);
- jnz 1b"
- :: "D"(ptr),
+ __asm__ __volatile__ (
+ "\n1:\t"
+ "movl (%0), %%eax\n\t"
+ "movl 4(%0), %%edx\n\t"
+ "cmpxchg8b (%0)\n\t"
+ "jnz 1b"
+ : /* no outputs */
+ : "D"(ptr),
"b"(low),
"c"(high)
- :
- "ax","dx","memory");
+ : "ax","dx","memory");
}
extern void inline __set_64bit_constant (unsigned long long *ptr,