ia64/xen-unstable

changeset 2356:cfe5c20ae78e

bitkeeper revision 1.1159.53.4 (412ea0b0d3MOd1UTMgtz-Ab-RIhbkQ)

linux 2.6.8.1 now correctly accounts system and idle time -- it was testing for ring 0 rather than ring 1.
author iap10@labyrinth.cl.cam.ac.uk
date Fri Aug 27 02:47:12 2004 +0000 (2004-08-27)
parents e5d651fc9af5
children 0c5ea7a9e5ad cc7f31b32068 0ee3f9767bb4
files .rootkeys linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/timers/timer_tsc.c linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/ptrace.h
line diff
     1.1 --- a/.rootkeys	Thu Aug 26 22:51:10 2004 +0000
     1.2 +++ b/.rootkeys	Fri Aug 27 02:47:12 2004 +0000
     1.3 @@ -230,6 +230,7 @@ 412e01beTwiaC8sYY4XJP8PxLST5CA linux-2.6
     1.4  40f5623aEToIXouJgO-ao5d5pcEt1w linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/pgtable-2level.h
     1.5  40f5623aCCXRPlGpNthVXstGz9ZV3A linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/pgtable.h
     1.6  40f5623aPCkQQfPtJSooGdhcatrvnQ linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/processor.h
     1.7 +412ea0afQL2CAI-f522TbLjLPMibPQ linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/ptrace.h
     1.8  40f5623bzLvxr7WoJIxVf2OH4rCBJg linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/segment.h
     1.9  40f5623bG_LzgG6-qwk292nTc5Wabw linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/setup.h
    1.10  40f5623bgzm_9vwxpzJswlAxg298Gg linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/synch_bitops.h
     2.1 --- a/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/timers/timer_tsc.c	Thu Aug 26 22:51:10 2004 +0000
     2.2 +++ b/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/timers/timer_tsc.c	Fri Aug 27 02:47:12 2004 +0000
     2.3 @@ -355,6 +355,8 @@ static int __init init_tsc(char* overrid
     2.4  
     2.5  	rdtscll(alarm);
     2.6  
     2.7 +	use_tsc=1;
     2.8 +
     2.9  	return 0;
    2.10  }
    2.11  
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/ptrace.h	Fri Aug 27 02:47:12 2004 +0000
     3.3 @@ -0,0 +1,62 @@
     3.4 +#ifndef _I386_PTRACE_H
     3.5 +#define _I386_PTRACE_H
     3.6 +
     3.7 +#define EBX 0
     3.8 +#define ECX 1
     3.9 +#define EDX 2
    3.10 +#define ESI 3
    3.11 +#define EDI 4
    3.12 +#define EBP 5
    3.13 +#define EAX 6
    3.14 +#define DS 7
    3.15 +#define ES 8
    3.16 +#define FS 9
    3.17 +#define GS 10
    3.18 +#define ORIG_EAX 11
    3.19 +#define EIP 12
    3.20 +#define CS  13
    3.21 +#define EFL 14
    3.22 +#define UESP 15
    3.23 +#define SS   16
    3.24 +#define FRAME_SIZE 17
    3.25 +
    3.26 +/* this struct defines the way the registers are stored on the 
    3.27 +   stack during a system call. */
    3.28 +
    3.29 +struct pt_regs {
    3.30 +	long ebx;
    3.31 +	long ecx;
    3.32 +	long edx;
    3.33 +	long esi;
    3.34 +	long edi;
    3.35 +	long ebp;
    3.36 +	long eax;
    3.37 +	int  xds;
    3.38 +	int  xes;
    3.39 +	long orig_eax;
    3.40 +	long eip;
    3.41 +	int  xcs;
    3.42 +	long eflags;
    3.43 +	long esp;
    3.44 +	int  xss;
    3.45 +};
    3.46 +
    3.47 +/* Arbitrarily choose the same ptrace numbers as used by the Sparc code. */
    3.48 +#define PTRACE_GETREGS            12
    3.49 +#define PTRACE_SETREGS            13
    3.50 +#define PTRACE_GETFPREGS          14
    3.51 +#define PTRACE_SETFPREGS          15
    3.52 +#define PTRACE_GETFPXREGS         18
    3.53 +#define PTRACE_SETFPXREGS         19
    3.54 +
    3.55 +#define PTRACE_OLDSETOPTIONS         21
    3.56 +
    3.57 +#define PTRACE_GET_THREAD_AREA    25
    3.58 +#define PTRACE_SET_THREAD_AREA    26
    3.59 +
    3.60 +#ifdef __KERNEL__
    3.61 +#define user_mode(regs) ((VM_MASK & (regs)->eflags) || (2 & (regs)->xcs))
    3.62 +#define instruction_pointer(regs) ((regs)->eip)
    3.63 +#endif
    3.64 +
    3.65 +#endif