]>
Commit | Line | Data |
---|---|---|
00923833 JB |
1 | --- abi-tools-0.3/minixemu/minix.c.orig 2001-11-12 11:29:24.000000000 +0100 |
2 | +++ abi-tools-0.3/minixemu/minix.c 2008-01-19 19:30:20.253446347 +0100 | |
3 | @@ -26,7 +26,7 @@ | |
4 | #include "minix.h" | |
5 | ||
6 | extern int minix_syscall(minix_msg *m, int syscall, int fs); | |
7 | -volatile struct vm86_struct minix_cpu; | |
8 | +volatile struct vm86plus_struct minix_cpu; | |
9 | static unsigned char minix_space[128*1024+15]; /* The Linux vm will deal with not allocating the unused pages */ | |
10 | static unsigned char *minix_base; /* Paragraph aligned */ | |
11 | ||
12 | @@ -130,7 +130,7 @@ int run_minix() | |
13 | /* | |
14 | * Execute 8086 code for a while. | |
15 | */ | |
16 | - int err=vm86((struct vm86_struct *)&minix_cpu); | |
17 | + int err=vm86(VM86_ENTER, (struct vm86plus_struct *)&minix_cpu); | |
18 | switch(VM86_TYPE(err)) | |
19 | { | |
20 | /* | |
21 | --- abi-tools-0.3/minixemu/minix.h.orig 2001-11-12 11:12:59.000000000 +0100 | |
22 | +++ abi-tools-0.3/minixemu/minix.h 2008-01-19 19:30:34.862278857 +0100 | |
23 | @@ -127,9 +127,9 @@ struct minix_stat | |
24 | unsigned short st_gid; | |
25 | unsigned short st_rdev; | |
26 | int st_size; | |
27 | - int st_atime; | |
28 | - int st_mtime; | |
29 | - int st_ctime; | |
30 | + int mst_atime; | |
31 | + int mst_mtime; | |
32 | + int mst_ctime; | |
33 | }; | |
34 | ||
35 | ||
36 | @@ -250,4 +250,4 @@ typedef struct | |
37 | ||
38 | #define MINIX_DSEG(x) ((unsigned char *)(((x)&0xFFFF)+(minix_cpu.regs.ds<<4))) | |
39 | ||
40 | -extern volatile struct vm86_struct minix_cpu; | |
41 | +extern volatile struct vm86plus_struct minix_cpu; | |
42 | --- abi-tools-0.3/minixemu/minix_sys.c.orig 2001-11-12 11:19:25.000000000 +0100 | |
43 | +++ abi-tools-0.3/minixemu/minix_sys.c 2008-01-19 19:26:59.337996829 +0100 | |
44 | @@ -50,9 +50,9 @@ static void squash_stat(struct stat *s, | |
45 | ms->st_gid=s->st_gid; | |
46 | ms->st_rdev=s->st_rdev; | |
47 | ms->st_size=s->st_size; | |
48 | - ms->st_atime=s->st_atime; | |
49 | - ms->st_mtime=s->st_mtime; | |
50 | - ms->st_ctime=s->st_ctime; | |
51 | + ms->mst_atime=s->st_atime; | |
52 | + ms->mst_mtime=s->st_mtime; | |
53 | + ms->mst_ctime=s->st_ctime; | |
54 | } | |
55 | ||
56 | /* |