diff -urN linux-2.5.1-pre1/arch/i386/kernel/traps.c linux/arch/i386/kernel/traps.c
--- linux-2.5.1-pre1/arch/i386/kernel/traps.c Sun Sep 30 15:26:08 2001
+++ linux/arch/i386/kernel/traps.c Sun Nov 25 01:02:08 2001
@@ -697,7 +697,7 @@
*/
asmlinkage void math_state_restore(struct pt_regs regs)
{
- __asm__ __volatile__("clts"); /* Allow maths ops (or we recurse) */
+ clts(); /* Allow maths ops (or we recurse) */
if (current->used_math) {
restore_fpu(current);
diff -urN linux-2.5.1-pre1/arch/i386/mm/init.c linux/arch/i386/mm/init.c
--- linux-2.5.1-pre1/arch/i386/mm/init.c Sun Nov 11 13:09:32 2001
+++ linux/arch/i386/mm/init.c Sun Nov 25 01:02:08 2001
@@ -333,7 +333,7 @@
{
pagetable_init();
- __asm__( "movl %%ecx,%%cr3\n" ::"c"(__pa(swapper_pg_dir)));
+ __asm__( "movl %0,%%cr3\n" ::"r"(__pa(swapper_pg_dir)));
#if CONFIG_X86_PAE
/*
diff -urN linux-2.5.1-pre1/drivers/net/hamradio/baycom_epp.c linux/drivers/net/hamradio/baycom_epp.c
--- linux-2.5.1-pre1/drivers/net/hamradio/baycom_epp.c Mon Sep 10 12:04:53 2001
+++ linux/drivers/net/hamradio/baycom_epp.c Sun Nov 25 01:02:08 2001
@@ -807,10 +807,11 @@
/* --------------------------------------------------------------------- */
#ifdef __i386__
+#include <asm/msr.h>
#define GETTICK(x) \
({ \
if (cpu_has_tsc) \
- __asm__ __volatile__("rdtsc" : "=a" (x) : : "dx");\
+ rdtscl(x); \
})
#else /* __i386__ */
#define GETTICK(x)