From c7c4310f7fc1485925d800628bf50b3aeab535ef Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Mon, 10 Jul 2000 23:18:26 +0000 Subject: Merge with Linux 2.4.0-test3-pre8. Linus has accepted most of what I've sent him, so we're very close to full integration of the MIPS port into his sources. --- include/asm-i386/socket.h | 2 ++ include/asm-i386/timex.h | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'include/asm-i386') diff --git a/include/asm-i386/socket.h b/include/asm-i386/socket.h index 9dc6c3389..c44d16bc0 100644 --- a/include/asm-i386/socket.h +++ b/include/asm-i386/socket.h @@ -40,6 +40,8 @@ #define SO_DETACH_FILTER 27 #define SO_PEERNAME 28 +#define SO_TIMESTAMP 29 +#define SCM_TIMESTAMP SO_TIMESTAMP /* Nasty libc5 fixup - bletch */ #if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) diff --git a/include/asm-i386/timex.h b/include/asm-i386/timex.h index f6cf7303d..1cb3b96b4 100644 --- a/include/asm-i386/timex.h +++ b/include/asm-i386/timex.h @@ -29,7 +29,7 @@ * four billion cycles just basically sounds like a good idea, * regardless of how fast the machine is. */ -typedef unsigned long cycles_t; +typedef unsigned long long cycles_t; extern cycles_t cacheflush_time; @@ -38,10 +38,10 @@ static inline cycles_t get_cycles (void) #ifndef CONFIG_X86_TSC return 0; #else - unsigned long eax, edx; + unsigned long long ret; - rdtsc(eax,edx); - return eax; + rdtscll(ret); + return ret; #endif } -- cgit v1.2.3