]> git.pld-linux.org Git - packages/kernel.git/blame - 2.6.2-rc3-syscalls.diff
projects / packages / kernel.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- added description of djurban's branch
[packages/kernel.git] / 2.6.2-rc3-syscalls.diff
CommitLineData
ff4ccc8a 1diff -Naurp -X /home/rddunlap/doc/dontdiff-osdl linux-262-rc3/arch/alpha/kernel/osf_sys.c linux-262-rc3-syscalls/arch/alpha/kernel/osf_sys.c
2--- linux-262-rc3/arch/alpha/kernel/osf_sys.c 2004-01-08 22:59:02.000000000 -0800
3+++ linux-262-rc3-syscalls/arch/alpha/kernel/osf_sys.c 2004-02-02 10:17:22.000000000 -0800
4@@ -17,6 +17,7 @@
5 #include <linux/smp.h>
6 #include <linux/smp_lock.h>
7 #include <linux/stddef.h>
8+#include <linux/syscalls.h>
9 #include <linux/unistd.h>
10 #include <linux/ptrace.h>
11 #include <linux/slab.h>
12@@ -1315,8 +1316,6 @@ arch_get_unmapped_area(struct file *filp
13 }
14
15 #ifdef CONFIG_OSF4_COMPAT
16-extern ssize_t sys_readv(unsigned long, const struct iovec *, unsigned long);
17-extern ssize_t sys_writev(unsigned long, const struct iovec *, unsigned long);
18
19 /* Clear top 32 bits of iov_len in the user's buffer for
20 compatibility with old versions of OSF/1 where iov_len
21diff -Naurp -X /home/rddunlap/doc/dontdiff-osdl linux-262-rc3/arch/ia64/ia32/ia32_ioctl.c linux-262-rc3-syscalls/arch/ia64/ia32/ia32_ioctl.c
22--- linux-262-rc3/arch/ia64/ia32/ia32_ioctl.c 2004-01-08 22:59:48.000000000 -0800
23+++ linux-262-rc3-syscalls/arch/ia64/ia32/ia32_ioctl.c 2004-02-02 10:17:22.000000000 -0800
24@@ -8,6 +8,7 @@
25 */
26
27 #include <linux/signal.h> /* argh, msdos_fs.h isn't self-contained... */
28+#include <linux/syscalls.h>
29 #include "ia32priv.h"
30
31 #define INCLUDES
32@@ -26,8 +27,6 @@
33 _ret; \
34 })
35
36-asmlinkage long sys_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg);
37-
38 #define CODE
39 #include "compat_ioctl.c"
40
41diff -Naurp -X /home/rddunlap/doc/dontdiff-osdl linux-262-rc3/arch/ia64/ia32/sys_ia32.c linux-262-rc3-syscalls/arch/ia64/ia32/sys_ia32.c
42--- linux-262-rc3/arch/ia64/ia32/sys_ia32.c 2004-02-02 09:54:09.000000000 -0800
43+++ linux-262-rc3-syscalls/arch/ia64/ia32/sys_ia32.c 2004-02-02 20:05:23.000000000 -0800
44@@ -15,6 +15,7 @@
45
46 #include <linux/config.h>
47 #include <linux/kernel.h>
48+#include <linux/syscalls.h>
49 #include <linux/sysctl.h>
50 #include <linux/sched.h>
51 #include <linux/fs.h>
52@@ -82,8 +83,6 @@
53 #define high2lowgid(gid) ((gid) > 65535 ? 65534 : (gid))
54
55 extern asmlinkage long sys_execve (char *, char **, char **, struct pt_regs *);
56-extern asmlinkage long sys_mprotect (unsigned long, size_t, unsigned long);
57-extern asmlinkage long sys_munmap (unsigned long, size_t);
58 extern unsigned long arch_get_unmapped_area (struct file *, unsigned long, unsigned long,
59 unsigned long, unsigned long);
60
61@@ -949,9 +948,6 @@ sys32_old_select (struct sel_arg_struct
62 (struct compat_timeval *) A(a.tvp));
63 }
64
65-asmlinkage ssize_t sys_readv (unsigned long,const struct iovec *,unsigned long);
66-asmlinkage ssize_t sys_writev (unsigned long,const struct iovec *,unsigned long);
67-
68 static struct iovec *
69 get_compat_iovec (struct compat_iovec *iov32, struct iovec *iov_buf, u32 count, int type)
70 {
71@@ -2307,8 +2303,6 @@ struct sysctl32 {
72 unsigned int __unused[4];
73 };
74
75-extern asmlinkage long sys_sysctl(struct __sysctl_args *args);
76-
77 asmlinkage long
78 sys32_sysctl (struct sysctl32 *args)
79 {
80@@ -2456,16 +2450,12 @@ sys32_setgroups16 (int gidsetsize, short
81 asmlinkage long
82 sys32_truncate64 (unsigned int path, unsigned int len_lo, unsigned int len_hi)
83 {
84- extern asmlinkage long sys_truncate (const char *path, unsigned long length);
85-
86 return sys_truncate((const char *) A(path), ((unsigned long) len_hi << 32) | len_lo);
87 }
88
89 asmlinkage long
90 sys32_ftruncate64 (int fd, unsigned int len_lo, unsigned int len_hi)
91 {
92- extern asmlinkage long sys_ftruncate (int fd, unsigned long length);
93-
94 return sys_ftruncate(fd, ((unsigned long) len_hi << 32) | len_lo);
95 }
96
97@@ -2554,7 +2544,6 @@ struct sysinfo32 {
98 asmlinkage long
99 sys32_sysinfo (struct sysinfo32 *info)
100 {
101- extern asmlinkage long sys_sysinfo (struct sysinfo *);
102 struct sysinfo s;
103 long ret, err;
104 int bitcount = 0;
105@@ -2636,7 +2625,6 @@ sys32_pwrite (unsigned int fd, void *buf
106 asmlinkage long
107 sys32_sendfile (int out_fd, int in_fd, int *offset, unsigned int count)
108 {
109- extern asmlinkage long sys_sendfile (int, int, off_t *, size_t);
110 mm_segment_t old_fs = get_fs();
111 long ret;
112 off_t of;
113@@ -2657,7 +2645,6 @@ sys32_sendfile (int out_fd, int in_fd, i
114 asmlinkage long
115 sys32_personality (unsigned int personality)
116 {
117- extern asmlinkage long sys_personality (unsigned long);
118 long ret;
119
120 if (current->personality == PER_LINUX32 && personality == PER_LINUX)
121@@ -3049,9 +3036,6 @@ copy_mount_stuff_to_kernel(const void *u
122 return 0;
123 }
124
125-extern asmlinkage long sys_mount(char * dev_name, char * dir_name, char * type,
126- unsigned long new_flags, void *data);
127-
128 #define SMBFS_NAME "smbfs"
129 #define NCPFS_NAME "ncpfs"
130
131@@ -3116,8 +3100,6 @@ sys32_mount(char *dev_name, char *dir_na
132 }
133 }
134
135-extern asmlinkage long sys_setreuid(uid_t ruid, uid_t euid);
136-
137 asmlinkage long sys32_setreuid(compat_uid_t ruid, compat_uid_t euid)
138 {
139 uid_t sruid, seuid;
140@@ -3127,8 +3109,6 @@ asmlinkage long sys32_setreuid(compat_ui
141 return sys_setreuid(sruid, seuid);
142 }
143
144-extern asmlinkage long sys_setresuid(uid_t ruid, uid_t euid, uid_t suid);
145-
146 asmlinkage long
147 sys32_setresuid(compat_uid_t ruid, compat_uid_t euid,
148 compat_uid_t suid)
149@@ -3141,8 +3121,6 @@ sys32_setresuid(compat_uid_t ruid, compa
150 return sys_setresuid(sruid, seuid, ssuid);
151 }
152
153-extern asmlinkage long sys_setregid(gid_t rgid, gid_t egid);
154-
155 asmlinkage long
156 sys32_setregid(compat_gid_t rgid, compat_gid_t egid)
157 {
158@@ -3153,8 +3131,6 @@ sys32_setregid(compat_gid_t rgid, compat
159 return sys_setregid(srgid, segid);
160 }
161
162-extern asmlinkage long sys_setresgid(gid_t rgid, gid_t egid, gid_t sgid);
163-
164 asmlinkage long
165 sys32_setresgid(compat_gid_t rgid, compat_gid_t egid,
166 compat_gid_t sgid)
167@@ -3284,8 +3260,6 @@ nfs_getfh32_res_trans(union nfsctl_res *
168 return err;
169 }
170
171-extern asmlinkage long sys_nfsservctl(int cmd, void *arg, void *resp);
172-
173 int asmlinkage
174 sys32_nfsservctl(int cmd, struct nfsctl_arg32 *arg32, union nfsctl_res32 *res32)
175 {
176diff -Naurp -X /home/rddunlap/doc/dontdiff-osdl linux-262-rc3/arch/mips/kernel/ioctl32.c linux-262-rc3-syscalls/arch/mips/kernel/ioctl32.c
177--- linux-262-rc3/arch/mips/kernel/ioctl32.c 2004-01-08 22:59:33.000000000 -0800
178+++ linux-262-rc3-syscalls/arch/mips/kernel/ioctl32.c 2004-02-02 10:17:22.000000000 -0800
179@@ -60,6 +60,7 @@
180 #include <linux/ethtool.h>
181 #include <linux/mii.h>
182 #include <linux/if_bonding.h>
183+#include <linux/syscalls.h>
184 #include <linux/watchdog.h>
185
186 #include <asm/ioctls.h>
187@@ -94,8 +95,6 @@
188 #include <asm/sibyte/trace_prof.h>
189 #endif
190
191-long sys_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg);
192-
193 static int w_long(unsigned int fd, unsigned int cmd, unsigned long arg)
194 {
195 mm_segment_t old_fs = get_fs();
196diff -Naurp -X /home/rddunlap/doc/dontdiff-osdl linux-262-rc3/arch/mips/kernel/irixioctl.c linux-262-rc3-syscalls/arch/mips/kernel/irixioctl.c
197--- linux-262-rc3/arch/mips/kernel/irixioctl.c 2004-01-08 22:59:46.000000000 -0800
198+++ linux-262-rc3-syscalls/arch/mips/kernel/irixioctl.c 2004-02-02 10:17:22.000000000 -0800
199@@ -11,6 +11,7 @@
200 #include <linux/smp.h>
201 #include <linux/smp_lock.h>
202 #include <linux/sockios.h>
203+#include <linux/syscalls.h>
204 #include <linux/tty.h>
205 #include <linux/file.h>
206
207@@ -26,9 +27,6 @@ struct irix_termios {
208 cc_t c_cc[NCCS];
209 };
210
211-extern asmlinkage int sys_ioctl(unsigned int fd, unsigned int cmd,
212- unsigned long arg);
213-extern asmlinkage int sys_write(unsigned int fd,char * buf,unsigned int count);
214 extern void start_tty(struct tty_struct *tty);
215 static struct tty_struct *get_tty(int fd)
216 {
217diff -Naurp -X /home/rddunlap/doc/dontdiff-osdl linux-262-rc3/arch/mips/kernel/linux32.c linux-262-rc3-syscalls/arch/mips/kernel/linux32.c
218--- linux-262-rc3/arch/mips/kernel/linux32.c 2004-01-08 22:59:45.000000000 -0800
219+++ linux-262-rc3-syscalls/arch/mips/kernel/linux32.c 2004-02-02 10:17:22.000000000 -0800
220@@ -24,6 +24,7 @@
221 #include <linux/sem.h>
222 #include <linux/msg.h>
223 #include <linux/icmpv6.h>
224+#include <linux/syscalls.h>
225 #include <linux/sysctl.h>
226 #include <linux/utime.h>
227 #include <linux/utsname.h>
228@@ -133,8 +134,6 @@ asmlinkage int sys_truncate64(const char
229 return sys_truncate(path, ((long) high << 32) | low);
230 }
231
232-asmlinkage long sys_ftruncate(unsigned int fd, unsigned long length);
233-
234 asmlinkage int sys_ftruncate64(unsigned int fd, unsigned int high,
235 unsigned int low)
236 {
237@@ -633,10 +632,6 @@ sys32_settimeofday(struct compat_timeval
238 return do_sys_settimeofday(tv ? &kts : NULL, tz ? &ktz : NULL);
239 }
240
241-extern asmlinkage long sys_llseek(unsigned int fd, unsigned long offset_high,
242- unsigned long offset_low, loff_t * result,
243- unsigned int origin);
244-
245 asmlinkage int sys32_llseek(unsigned int fd, unsigned int offset_high,
246 unsigned int offset_low, loff_t * result,
247 unsigned int origin)
248@@ -1734,8 +1729,6 @@ asmlinkage long sys32_newuname(struct ne
249 return ret;
250 }
251
252-extern asmlinkage long sys_personality(unsigned long);
253-
254 asmlinkage int sys32_personality(unsigned long personality)
255 {
256 int ret;
257@@ -1820,8 +1813,6 @@ asmlinkage int sys32_adjtimex(struct tim
258 return ret;
259 }
260
261-extern asmlinkage ssize_t sys_sendfile(int out_fd, int in_fd, off_t *offset, size_t count);
262-
263 asmlinkage int sys32_sendfile(int out_fd, int in_fd, compat_off_t *offset,
264 s32 count)
265 {
266@@ -1842,8 +1833,6 @@ asmlinkage int sys32_sendfile(int out_fd
267 return ret;
268 }
269
270-asmlinkage ssize_t sys_readahead(int fd, loff_t offset, size_t count);
271-
272 asmlinkage ssize_t sys32_readahead(int fd, u32 pad0, u64 a2, u64 a3,
273 size_t count)
274 {
275diff -Naurp -X /home/rddunlap/doc/dontdiff-osdl linux-262-rc3/arch/mips/kernel/sysirix.c linux-262-rc3-syscalls/arch/mips/kernel/sysirix.c
276--- linux-262-rc3/arch/mips/kernel/sysirix.c 2004-01-08 23:00:02.000000000 -0800
277+++ linux-262-rc3-syscalls/arch/mips/kernel/sysirix.c 2004-02-02 10:17:22.000000000 -0800
278@@ -29,6 +29,7 @@
279 #include <linux/namei.h>
280 #include <linux/socket.h>
281 #include <linux/security.h>
282+#include <linux/syscalls.h>
283
284 #include <asm/ptrace.h>
285 #include <asm/page.h>
286@@ -238,8 +239,6 @@ extern unsigned long irix_mapelf(int fd,
287 extern asmlinkage int sys_setpgid(pid_t pid, pid_t pgid);
288 extern void sys_sync(void);
289 extern asmlinkage int sys_getsid(pid_t pid);
290-extern asmlinkage long sys_write (unsigned int fd, const char *buf, unsigned long count);
291-extern asmlinkage long sys_lseek (unsigned int fd, off_t offset, unsigned int origin);
292 extern asmlinkage int sys_getgroups(int gidsetsize, gid_t *grouplist);
293 extern asmlinkage int sys_setgroups(int gidsetsize, gid_t *grouplist);
294 extern int getrusage(struct task_struct *p, int who, struct rusage *ru);
295@@ -694,9 +693,6 @@ asmlinkage int irix_pause(void)
296 return -EINTR;
297 }
298
299-extern asmlinkage long sys_mount(char * dev_name, char * dir_name, char * type,
300- unsigned long new_flags, void * data);
301-
302 /* XXX need more than this... */
303 asmlinkage int irix_mount(char *dev_name, char *dir_name, unsigned long flags,
304 char *type, void *data, int datalen)
305@@ -1356,8 +1352,6 @@ asmlinkage int irix_fxstat(int version,
306 return error;
307 }
308
309-extern asmlinkage int sys_mknod(const char * filename, int mode, unsigned dev);
310-
311 asmlinkage int irix_xmknod(int ver, char *filename, int mode, unsigned dev)
312 {
313 int retval;
314@@ -1532,10 +1526,6 @@ out:
315 return retval;
316 }
317
318-extern asmlinkage unsigned long
319-sys_mmap(unsigned long addr, size_t len, int prot, int flags, int fd,
320- off_t offset);
321-
322 asmlinkage int irix_mmap64(struct pt_regs *regs)
323 {
324 int len, prot, flags, fd, off1, off2, error, base = 0;
325@@ -2106,9 +2096,6 @@ out:
326
327 #undef DEBUG_FCNTL
328
329-extern asmlinkage long sys_fcntl(unsigned int fd, unsigned int cmd,
330- unsigned long arg);
331-
332 #define IRIX_F_ALLOCSP 10
333
334 asmlinkage int irix_fcntl(int fd, int cmd, int arg)
335diff -Naurp -X /home/rddunlap/doc/dontdiff-osdl linux-262-rc3/arch/parisc/hpux/ioctl.c linux-262-rc3-syscalls/arch/parisc/hpux/ioctl.c
336--- linux-262-rc3/arch/parisc/hpux/ioctl.c 2004-01-08 22:59:10.000000000 -0800
337+++ linux-262-rc3-syscalls/arch/parisc/hpux/ioctl.c 2004-02-02 10:17:22.000000000 -0800
338@@ -21,13 +21,12 @@
339
340 #include <linux/sched.h>
341 #include <linux/smp_lock.h>
342+#include <linux/syscalls.h>
343 #include <asm/errno.h>
344 #include <asm/ioctl.h>
345 #include <asm/termios.h>
346 #include <asm/uaccess.h>
347
348-int sys_ioctl(unsigned int, unsigned int, unsigned long);
349-
350 static int hpux_ioctl_t(int fd, unsigned long cmd, unsigned long arg)
351 {
352 int result = -EOPNOTSUPP;
353diff -Naurp -X /home/rddunlap/doc/dontdiff-osdl linux-262-rc3/arch/parisc/hpux/sys_hpux.c linux-262-rc3-syscalls/arch/parisc/hpux/sys_hpux.c
354--- linux-262-rc3/arch/parisc/hpux/sys_hpux.c 2004-01-08 22:59:42.000000000 -0800
355+++ linux-262-rc3-syscalls/arch/parisc/hpux/sys_hpux.c 2004-02-02 11:08:14.000000000 -0800
356@@ -8,6 +8,7 @@
357 #include <linux/sched.h>
358 #include <linux/slab.h>
359 #include <linux/smp_lock.h>
360+#include <linux/syscalls.h>
361 #include <linux/utsname.h>
362 #include <linux/vmalloc.h>
363 #include <linux/vfs.h>
364@@ -251,9 +252,6 @@ static int hpux_uname(struct hpux_utsnam
365 return error;
366 }
367
368-int sys_sethostname(char *, int);
369-int sys_gethostname(char *, int);
370-
371 /* Note: HP-UX just uses the old suser() function to check perms
372 * in this system call. We'll use capable(CAP_SYS_ADMIN).
373 */
374diff -Naurp -X /home/rddunlap/doc/dontdiff-osdl linux-262-rc3/arch/parisc/kernel/sys_parisc32.c linux-262-rc3-syscalls/arch/parisc/kernel/sys_parisc32.c
375--- linux-262-rc3/arch/parisc/kernel/sys_parisc32.c 2004-01-08 22:59:19.000000000 -0800
376+++ linux-262-rc3-syscalls/arch/parisc/kernel/sys_parisc32.c 2004-02-02 10:17:22.000000000 -0800
377@@ -47,6 +47,7 @@
378 #include <linux/vfs.h>
379 #include <linux/ptrace.h>
380 #include <linux/swap.h>
381+#include <linux/syscalls.h>
382
383 #include <asm/types.h>
384 #include <asm/uaccess.h>
385@@ -1089,7 +1090,6 @@ asmlinkage long sys32_msgrcv(int msqid,
386 }
387
388
389-extern asmlinkage ssize_t sys_sendfile(int out_fd, int in_fd, off_t *offset, size_t count);
390 asmlinkage int sys32_sendfile(int out_fd, int in_fd, compat_off_t *offset, s32 count)
391 {
392 mm_segment_t old_fs = get_fs();
393@@ -1197,7 +1197,6 @@ asmlinkage int sys32_nfsservctl(int cmd,
394 return ret;
395 }
396
397-extern asmlinkage ssize_t sys_sendfile64(int out_fd, int in_fd, loff_t *offset, size_t count);
398 typedef long __kernel_loff_t32; /* move this to asm/posix_types.h? */
399
400 asmlinkage int sys32_sendfile64(int out_fd, int in_fd, __kernel_loff_t32 *offset, s32 count)
401@@ -1345,8 +1344,6 @@ asmlinkage int sys32_sysinfo(struct sysi
402 * half of the argument has been zeroed by syscall.S.
403 */
404
405-extern asmlinkage off_t sys_lseek(unsigned int fd, off_t offset, unsigned int origin);
406-
407 asmlinkage int sys32_lseek(unsigned int fd, int offset, unsigned int origin)
408 {
409 return sys_lseek(fd, offset, origin);
410@@ -1367,8 +1364,6 @@ asmlinkage long sys32_semctl(int semid,
411 return sys_semctl (semid, semnum, cmd, arg);
412 }
413
414-extern long sys_lookup_dcookie(u64 cookie64, char *buf, size_t len);
415-
416 long sys32_lookup_dcookie(u32 cookie_high, u32 cookie_low, char *buf,
417 size_t len)
418 {
419diff -Naurp -X /home/rddunlap/doc/dontdiff-osdl linux-262-rc3/arch/parisc/kernel/sys_parisc.c linux-262-rc3-syscalls/arch/parisc/kernel/sys_parisc.c
420--- linux-262-rc3/arch/parisc/kernel/sys_parisc.c 2004-02-02 09:54:10.000000000 -0800
421+++ linux-262-rc3-syscalls/arch/parisc/kernel/sys_parisc.c 2004-02-02 10:17:22.000000000 -0800
422@@ -12,6 +12,7 @@
423 #include <linux/mman.h>
424 #include <linux/shm.h>
425 #include <linux/smp_lock.h>
426+#include <linux/syscalls.h>
427
428 int sys_pipe(int *fildes)
429 {
430@@ -164,10 +165,6 @@ long sys_shmat_wrapper(int shmid, char *
431 /* Fucking broken ABI */
432
433 #ifdef CONFIG_PARISC64
434-extern asmlinkage long sys_truncate(const char *, unsigned long);
435-extern asmlinkage long sys_ftruncate(unsigned int, unsigned long);
436-extern asmlinkage long sys_fcntl(unsigned int, unsigned int, unsigned long);
437-
438 asmlinkage long parisc_truncate64(const char * path,
439 unsigned int high, unsigned int low)
440 {
441@@ -196,9 +193,6 @@ asmlinkage long sys_fcntl64(unsigned int
442 }
443 #else
444
445-extern asmlinkage long sys_truncate64(const char *, loff_t);
446-extern asmlinkage long sys_ftruncate64(unsigned int, loff_t);
447-
448 asmlinkage long parisc_truncate64(const char * path,
449 unsigned int high, unsigned int low)
450 {
451@@ -212,12 +206,6 @@ asmlinkage long parisc_ftruncate64(unsig
452 }
453 #endif
454
455-extern asmlinkage ssize_t sys_pread64(unsigned int fd, char *buf,
456- size_t count, loff_t pos);
457-extern asmlinkage ssize_t sys_pwrite64(unsigned int fd, const char *buf,
458- size_t count, loff_t pos);
459-extern asmlinkage ssize_t sys_readahead(int fd, loff_t offset, size_t count);
460-
461 asmlinkage ssize_t parisc_pread64(unsigned int fd, char *buf, size_t count,
462 unsigned int high, unsigned int low)
463 {
464diff -Naurp -X /home/rddunlap/doc/dontdiff-osdl linux-262-rc3/arch/ppc64/kernel/ppc_ksyms.c linux-262-rc3-syscalls/arch/ppc64/kernel/ppc_ksyms.c
465--- linux-262-rc3/arch/ppc64/kernel/ppc_ksyms.c 2004-02-02 09:54:11.000000000 -0800
466+++ linux-262-rc3-syscalls/arch/ppc64/kernel/ppc_ksyms.c 2004-02-02 10:17:22.000000000 -0800
467@@ -20,6 +20,7 @@
468 #include <linux/pci.h>
469 #include <linux/delay.h>
470 #include <linux/smp_lock.h>
471+#include <linux/syscalls.h>
472
473 #include <asm/page.h>
474 #include <asm/semaphore.h>
475@@ -48,7 +49,6 @@
476 #include <asm/iSeries/HvLpConfig.h>
477 #endif
478
479-extern int sys_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg);
480 extern int do_signal(sigset_t *, struct pt_regs *);
481
482 int abs(int);
483diff -Naurp -X /home/rddunlap/doc/dontdiff-osdl linux-262-rc3/arch/ppc64/kernel/sys_ppc32.c linux-262-rc3-syscalls/arch/ppc64/kernel/sys_ppc32.c
484--- linux-262-rc3/arch/ppc64/kernel/sys_ppc32.c 2004-02-02 09:54:11.000000000 -0800
485+++ linux-262-rc3-syscalls/arch/ppc64/kernel/sys_ppc32.c 2004-02-02 20:38:33.000000000 -0800
486@@ -53,6 +53,8 @@
487 #include <linux/ipv6.h>
488 #include <linux/in.h>
489 #include <linux/icmpv6.h>
490+#include <linux/syscalls.h>
491+#include <linux/unistd.h>
492 #include <linux/sysctl.h>
493 #include <linux/binfmts.h>
494 #include <linux/dnotify.h>
495@@ -775,8 +777,6 @@ int cp_compat_stat(struct kstat *stat, s
496 return err;
497 }
498
499-extern asmlinkage long sys_sysfs(int option, unsigned long arg1, unsigned long arg2);
500-
501 /* Note: it is necessary to treat option as an unsigned int,
502 * with the corresponding cast to a signed int to insure that the
503 * proper conversion (sign extension) between the register representation of a signed int (msr in 32-bit mode)
504@@ -1152,8 +1152,6 @@ struct sysinfo32 {
505 char _f[20-2*sizeof(int)-sizeof(int)];
506 };
507
508-extern asmlinkage long sys_sysinfo(struct sysinfo *info);
509-
510 asmlinkage long sys32_sysinfo(struct sysinfo32 *info)
511 {
512 struct sysinfo s;
513@@ -1865,8 +1863,6 @@ asmlinkage long sys32_ipc(u32 call, u32
514 return err;
515 }
516
517-extern asmlinkage ssize_t sys_sendfile(int out_fd, int in_fd, off_t* offset, size_t count);
518-
519 /* Note: it is necessary to treat out_fd and in_fd as unsigned ints,
520 * with the corresponding cast to a signed int to insure that the
521 * proper conversion (sign extension) between the register representation of a signed int (msr in 32-bit mode)
522@@ -1891,8 +1887,6 @@ asmlinkage long sys32_sendfile(u32 out_f
523 return ret;
524 }
525
526-extern asmlinkage ssize_t sys_sendfile64(int out_fd, int in_fd, loff_t *offset, size_t count);
527-
528 asmlinkage int sys32_sendfile64(int out_fd, int in_fd, compat_loff_t *offset, s32 count)
529 {
530 mm_segment_t old_fs = get_fs();
531@@ -2193,9 +2187,6 @@ asmlinkage int sys32_sched_rr_get_interv
532 return ret;
533 }
534
535-extern asmlinkage int sys_pciconfig_read(unsigned long bus, unsigned long dfn, unsigned long off,
536- unsigned long len, unsigned char *buf);
537-
538 asmlinkage int sys32_pciconfig_read(u32 bus, u32 dfn, u32 off, u32 len, u32 ubuf)
539 {
540 return sys_pciconfig_read((unsigned long) bus,
541@@ -2205,12 +2196,6 @@ asmlinkage int sys32_pciconfig_read(u32
542 (unsigned char *)AA(ubuf));
543 }
544
545-
546-
547-
548-extern asmlinkage int sys_pciconfig_write(unsigned long bus, unsigned long dfn, unsigned long off,
549- unsigned long len, unsigned char *buf);
550-
551 asmlinkage int sys32_pciconfig_write(u32 bus, u32 dfn, u32 off, u32 len, u32 ubuf)
552 {
553 return sys_pciconfig_write((unsigned long) bus,
554@@ -2234,8 +2219,6 @@ asmlinkage int ppc64_newuname(struct new
555 return errno;
556 }
557
558-extern asmlinkage long sys_personality(unsigned long);
559-
560 asmlinkage int ppc64_personality(unsigned long personality)
561 {
562 int ret;
563@@ -2249,8 +2232,6 @@ asmlinkage int ppc64_personality(unsigne
564
565
566
567-extern asmlinkage long sys_access(const char * filename, int mode);
568-
569 /* Note: it is necessary to treat mode as an unsigned int,
570 * with the corresponding cast to a signed int to insure that the
571 * proper conversion (sign extension) between the register representation of a signed int (msr in 32-bit mode)
572@@ -2262,8 +2243,6 @@ asmlinkage long sys32_access(const char
573 }
574
575
576-extern asmlinkage long sys_creat(const char * pathname, int mode);
577-
578 /* Note: it is necessary to treat mode as an unsigned int,
579 * with the corresponding cast to a signed int to insure that the
580 * proper conversion (sign extension) between the register representation of a signed int (msr in 32-bit mode)
581@@ -2352,8 +2331,6 @@ asmlinkage long sys32_kill(u32 pid, u32
582 }
583
584
585-extern asmlinkage long sys_mkdir(const char * pathname, int mode);
586-
587 /* Note: it is necessary to treat mode as an unsigned int,
588 * with the corresponding cast to a signed int to insure that the
589 * proper conversion (sign extension) between the register representation of a signed int (msr in 32-bit mode)
590@@ -2372,8 +2349,6 @@ long sys32_nice(u32 increment)
591 return sys_nice((int)increment);
592 }
593
594-extern off_t sys_lseek(unsigned int fd, off_t offset, unsigned int origin);
595-
596 off_t ppc32_lseek(unsigned int fd, u32 offset, unsigned int origin)
597 {
598 /* sign extend n */
599@@ -2411,8 +2386,6 @@ out_error:
600 goto out;
601 }
602
603-extern asmlinkage long sys_readlink(const char * path, char * buf, int bufsiz);
604-
605 /* Note: it is necessary to treat bufsiz as an unsigned int,
606 * with the corresponding cast to a signed int to insure that the
607 * proper conversion (sign extension) between the register representation of a signed int (msr in 32-bit mode)
608@@ -2501,8 +2474,6 @@ asmlinkage long sys32_sched_setscheduler
609 }
610
611
612-extern asmlinkage long sys_setdomainname(char *name, int len);
613-
614 /* Note: it is necessary to treat len as an unsigned int,
615 * with the corresponding cast to a signed int to insure that the
616 * proper conversion (sign extension) between the register representation of a signed int (msr in 32-bit mode)
617@@ -2527,8 +2498,6 @@ asmlinkage long sys32_setgroups(u32 gids
618 }
619
620
621-extern asmlinkage long sys_sethostname(char *name, int len);
622-
623 asmlinkage long sys32_sethostname(char *name, u32 len)
624 {
625 /* sign extend len */
626@@ -2569,8 +2538,6 @@ asmlinkage long sys32_ssetmask(u32 newma
627 return sys_ssetmask((int) newmask);
628 }
629
630-extern asmlinkage long sys_syslog(int type, char * buf, int len);
631-
632 long sys32_syslog(u32 type, char * buf, u32 len)
633 {
634 /* sign extend len */
635@@ -2591,8 +2558,6 @@ asmlinkage long sys32_umask(u32 mask)
636 }
637
638
639-extern asmlinkage long sys_umount(char * name, int flags);
640-
641 /* Note: it is necessary to treat flags as an unsigned int,
642 * with the corresponding cast to a signed int to insure that the
643 * proper conversion (sign extension) between the register representation of a signed int (msr in 32-bit mode)
644@@ -2695,10 +2660,6 @@ int sys32_olduname(struct oldold_utsname
645 return error;
646 }
647
648-extern unsigned long sys_mmap(unsigned long addr, size_t len,
649- unsigned long prot, unsigned long flags,
650- unsigned long fd, off_t offset);
651-
652 unsigned long sys32_mmap2(unsigned long addr, size_t len,
653 unsigned long prot, unsigned long flags,
654 unsigned long fd, unsigned long pgoff)
655@@ -2752,11 +2713,6 @@ long sys32_tgkill(u32 tgid, u32 pid, int
656 * long long munging:
657 * The 32 bit ABI passes long longs in an odd even register pair.
658 */
659-extern ssize_t sys_pread64(unsigned int fd, char *buf, size_t count,
660- loff_t pos);
661-
662-extern ssize_t sys_pwrite64(unsigned int fd, const char *buf, size_t count,
663- loff_t pos);
664
665 compat_ssize_t sys32_pread64(unsigned int fd, char *ubuf, compat_size_t count,
666 u32 reg6, u32 poshi, u32 poslo)
667@@ -2770,16 +2726,11 @@ compat_ssize_t sys32_pwrite64(unsigned i
668 return sys_pwrite64(fd, ubuf, count, ((loff_t)poshi << 32) | poslo);
669 }
670
671-extern ssize_t sys_readahead(int fd, loff_t offset, size_t count);
672-
673 compat_ssize_t sys32_readahead(int fd, u32 r4, u32 offhi, u32 offlo, u32 count)
674 {
675 return sys_readahead(fd, ((loff_t)offhi << 32) | offlo, count);
676 }
677
678-extern asmlinkage long sys_truncate(const char * path, unsigned long length);
679-extern asmlinkage long sys_ftruncate(unsigned int fd, unsigned long length);
680-
681 asmlinkage int sys32_truncate64(const char * path, u32 reg4,
682 unsigned long high, unsigned long low)
683 {
684@@ -2792,8 +2743,6 @@ asmlinkage int sys32_ftruncate64(unsigne
685 return sys_ftruncate(fd, (high << 32) | low);
686 }
687
688-extern long sys_lookup_dcookie(u64 cookie64, char *buf, size_t len);
689-
690 long ppc32_lookup_dcookie(u32 cookie_high, u32 cookie_low, char *buf,
691 size_t len)
692 {
693diff -Naurp -X /home/rddunlap/doc/dontdiff-osdl linux-262-rc3/arch/s390/kernel/compat_linux.c linux-262-rc3-syscalls/arch/s390/kernel/compat_linux.c
694--- linux-262-rc3/arch/s390/kernel/compat_linux.c 2004-02-02 09:54:11.000000000 -0800
695+++ linux-262-rc3-syscalls/arch/s390/kernel/compat_linux.c 2004-02-02 10:17:22.000000000 -0800
696@@ -55,6 +55,7 @@
697 #include <linux/ipv6.h>
698 #include <linux/in.h>
699 #include <linux/icmpv6.h>
700+#include <linux/syscalls.h>
701 #include <linux/sysctl.h>
702 #include <linux/binfmts.h>
703 #include <linux/compat.h>
704@@ -71,15 +72,8 @@
705
706 #include "compat_linux.h"
707
708-extern asmlinkage long sys_chown(const char *, uid_t,gid_t);
709-extern asmlinkage long sys_lchown(const char *, uid_t,gid_t);
710-extern asmlinkage long sys_fchown(unsigned int, uid_t,gid_t);
711-extern asmlinkage long sys_setregid(gid_t, gid_t);
712 extern asmlinkage long sys_setgid(gid_t);
713-extern asmlinkage long sys_setreuid(uid_t, uid_t);
714 extern asmlinkage long sys_setuid(uid_t);
715-extern asmlinkage long sys_setresuid(uid_t, uid_t, uid_t);
716-extern asmlinkage long sys_setresgid(gid_t, gid_t, gid_t);
717 extern asmlinkage long sys_setfsuid(uid_t);
718 extern asmlinkage long sys_setfsgid(gid_t);
719
720@@ -884,9 +878,6 @@ out:
721 return err;
722 }
723
724-extern asmlinkage long sys_truncate(const char * path, unsigned long length);
725-extern asmlinkage long sys_ftruncate(unsigned int fd, unsigned long length);
726-
727 asmlinkage int sys32_truncate64(const char * path, unsigned long high, unsigned long low)
728 {
729 if ((int)high < 0)
730@@ -2319,12 +2310,6 @@ asmlinkage int sys32_prctl(int option, u
731 }
732
733
734-extern asmlinkage ssize_t sys_pread64(unsigned int fd, char * buf,
735- size_t count, loff_t pos);
736-
737-extern asmlinkage ssize_t sys_pwrite64(unsigned int fd, const char * buf,
738- size_t count, loff_t pos);
739-
740 asmlinkage compat_ssize_t sys32_pread64(unsigned int fd, char *ubuf,
741 compat_size_t count, u32 poshi, u32 poslo)
742 {
743@@ -2341,15 +2326,11 @@ asmlinkage compat_ssize_t sys32_pwrite64
744 return sys_pwrite64(fd, ubuf, count, ((loff_t)AA(poshi) << 32) | AA(poslo));
745 }
746
747-extern asmlinkage ssize_t sys_readahead(int fd, loff_t offset, size_t count);
748-
749 asmlinkage compat_ssize_t sys32_readahead(int fd, u32 offhi, u32 offlo, s32 count)
750 {
751 return sys_readahead(fd, ((loff_t)AA(offhi) << 32) | AA(offlo), count);
752 }
753
754-extern asmlinkage ssize_t sys_sendfile(int out_fd, int in_fd, off_t *offset, size_t count);
755-
756 asmlinkage int sys32_sendfile(int out_fd, int in_fd, compat_off_t *offset, s32 count)
757 {
758 mm_segment_t old_fs = get_fs();
759@@ -2369,9 +2350,6 @@ asmlinkage int sys32_sendfile(int out_fd
760 return ret;
761 }
762
763-extern asmlinkage ssize_t sys_sendfile64(int out_fd, int in_fd,
764- loff_t *offset, size_t count);
765-
766 asmlinkage int sys32_sendfile64(int out_fd, int in_fd,
767 compat_loff_t *offset, s32 count)
768 {
769@@ -2676,8 +2654,6 @@ out:
770 return error;
771 }
772
773-asmlinkage ssize_t sys_read(unsigned int fd, char * buf, size_t count);
774-
775 asmlinkage compat_ssize_t sys32_read(unsigned int fd, char * buf, size_t count)
776 {
777 if ((compat_ssize_t) count < 0)
778@@ -2686,8 +2662,6 @@ asmlinkage compat_ssize_t sys32_read(uns
779 return sys_read(fd, buf, count);
780 }
781
782-asmlinkage ssize_t sys_write(unsigned int fd, const char * buf, size_t count);
783-
784 asmlinkage compat_ssize_t sys32_write(unsigned int fd, char * buf, size_t count)
785 {
786 if ((compat_ssize_t) count < 0)
787diff -Naurp -X /home/rddunlap/doc/dontdiff-osdl linux-262-rc3/arch/s390/kernel/compat_linux.h linux-262-rc3-syscalls/arch/s390/kernel/compat_linux.h
788--- linux-262-rc3/arch/s390/kernel/compat_linux.h 2004-02-02 09:54:11.000000000 -0800
789+++ linux-262-rc3-syscalls/arch/s390/kernel/compat_linux.h 2004-02-02 10:20:45.000000000 -0800
790@@ -4,6 +4,7 @@
791 #include <linux/config.h>
792 #include <linux/compat.h>
793 #include <linux/socket.h>
794+#include <linux/syscalls.h>
795 #include <linux/nfs_fs.h>
796 #include <linux/sunrpc/svc.h>
797 #include <linux/nfsd/nfsd.h>
798diff -Naurp -X /home/rddunlap/doc/dontdiff-osdl linux-262-rc3/arch/s390/kernel/sys_s390.c linux-262-rc3-syscalls/arch/s390/kernel/sys_s390.c
799--- linux-262-rc3/arch/s390/kernel/sys_s390.c 2004-02-02 09:54:11.000000000 -0800
800+++ linux-262-rc3-syscalls/arch/s390/kernel/sys_s390.c 2004-02-02 10:17:22.000000000 -0800
801@@ -21,6 +21,7 @@
802 #include <linux/msg.h>
803 #include <linux/shm.h>
804 #include <linux/stat.h>
805+#include <linux/syscalls.h>
806 #include <linux/mman.h>
807 #include <linux/file.h>
808 #include <linux/utsname.h>
809@@ -310,8 +311,6 @@ asmlinkage int s390x_newuname(struct new
810 return ret;
811 }
812
813-extern asmlinkage long sys_personality(unsigned long);
814-
815 asmlinkage int s390x_personality(unsigned long personality)
816 {
817 int ret;
818diff -Naurp -X /home/rddunlap/doc/dontdiff-osdl linux-262-rc3/arch/sparc/kernel/sunos_ioctl.c linux-262-rc3-syscalls/arch/sparc/kernel/sunos_ioctl.c
819--- linux-262-rc3/arch/sparc/kernel/sunos_ioctl.c 2004-01-08 23:00:02.000000000 -0800
820+++ linux-262-rc3-syscalls/arch/sparc/kernel/sunos_ioctl.c 2004-02-02 10:17:22.000000000 -0800
821@@ -21,6 +21,7 @@
822 #include <linux/mm.h>
823 #include <linux/smp.h>
824 #include <linux/smp_lock.h>
825+#include <linux/syscalls.h>
826 #include <linux/file.h>
827 #include <asm/kbio.h>
828
829@@ -32,7 +33,6 @@ extern char sunkbd_layout;
830 /* NR_OPEN is now larger and dynamic in recent kernels. */
831 #define SUNOS_NR_OPEN 256
832
833-extern asmlinkage int sys_ioctl(unsigned int, unsigned int, unsigned long);
834 extern asmlinkage int sys_setsid(void);
835
836 asmlinkage int sunos_ioctl (int fd, unsigned long cmd, unsigned long arg)
837diff -Naurp -X /home/rddunlap/doc/dontdiff-osdl linux-262-rc3/arch/sparc/kernel/sys_sunos.c linux-262-rc3-syscalls/arch/sparc/kernel/sys_sunos.c
838--- linux-262-rc3/arch/sparc/kernel/sys_sunos.c 2004-01-08 22:59:26.000000000 -0800
839+++ linux-262-rc3-syscalls/arch/sparc/kernel/sys_sunos.c 2004-02-02 10:17:22.000000000 -0800
840@@ -33,6 +33,7 @@
841 #include <linux/errno.h>
842 #include <linux/smp.h>
843 #include <linux/smp_lock.h>
844+#include <linux/syscalls.h>
845
846 #include <net/sock.h>
847
848@@ -1050,13 +1051,9 @@ static inline int check_nonblock(int ret
849 return ret;
850 }
851
852-extern asmlinkage ssize_t sys_read(unsigned int fd,char *buf,int count);
853-extern asmlinkage ssize_t sys_write(unsigned int fd,char *buf,int count);
854 extern asmlinkage int sys_recv(int fd, void * ubuf, int size, unsigned flags);
855 extern asmlinkage int sys_send(int fd, void * buff, int len, unsigned flags);
856 extern asmlinkage int sys_accept(int fd, struct sockaddr *sa, int *addrlen);
857-extern asmlinkage int sys_readv(unsigned long fd, const struct iovec * vector, long count);
858-extern asmlinkage int sys_writev(unsigned long fd, const struct iovec * vector, long count);
859
860
861 asmlinkage int sunos_read(unsigned int fd,char *buf,int count)
862diff -Naurp -X /home/rddunlap/doc/dontdiff-osdl linux-262-rc3/arch/sparc64/kernel/sparc64_ksyms.c linux-262-rc3-syscalls/arch/sparc64/kernel/sparc64_ksyms.c
863--- linux-262-rc3/arch/sparc64/kernel/sparc64_ksyms.c 2004-01-08 22:59:56.000000000 -0800
864+++ linux-262-rc3-syscalls/arch/sparc64/kernel/sparc64_ksyms.c 2004-02-02 10:17:22.000000000 -0800
865@@ -22,6 +22,7 @@
866 #include <linux/fs.h>
867 #include <linux/mm.h>
868 #include <linux/socket.h>
869+#include <linux/syscalls.h>
870 #include <linux/percpu.h>
871 #include <net/compat.h>
872
873@@ -92,7 +93,6 @@ extern int sys_getegid(void);
874 extern int sys_getgid(void);
875 extern int svr4_getcontext(svr4_ucontext_t *uc, struct pt_regs *regs);
876 extern int svr4_setcontext(svr4_ucontext_t *uc, struct pt_regs *regs);
877-extern int sys_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg);
878 extern int compat_sys_ioctl(unsigned int fd, unsigned int cmd, u32 arg);
879 extern int (*handle_mathemu)(struct pt_regs *, struct fpustate *);
880 extern long sparc32_open(const char * filename, int flags, int mode);
881diff -Naurp -X /home/rddunlap/doc/dontdiff-osdl linux-262-rc3/arch/sparc64/kernel/sunos_ioctl32.c linux-262-rc3-syscalls/arch/sparc64/kernel/sunos_ioctl32.c
882--- linux-262-rc3/arch/sparc64/kernel/sunos_ioctl32.c 2004-01-08 23:00:03.000000000 -0800
883+++ linux-262-rc3-syscalls/arch/sparc64/kernel/sunos_ioctl32.c 2004-02-02 10:17:22.000000000 -0800
884@@ -22,6 +22,7 @@
885 #include <linux/mm.h>
886 #include <linux/smp.h>
887 #include <linux/smp_lock.h>
888+#include <linux/syscalls.h>
889 #include <linux/compat.h>
890 #include <asm/kbio.h>
891
892@@ -90,8 +91,6 @@ struct ifconf32 {
893 compat_caddr_t ifcbuf;
894 };
895
896-extern asmlinkage int sys_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg);
897-
898 extern asmlinkage int compat_sys_ioctl(unsigned int, unsigned int, u32);
899 extern asmlinkage int sys_setsid(void);
900
901diff -Naurp -X /home/rddunlap/doc/dontdiff-osdl linux-262-rc3/arch/sparc64/kernel/sys_sparc32.c linux-262-rc3-syscalls/arch/sparc64/kernel/sys_sparc32.c
902--- linux-262-rc3/arch/sparc64/kernel/sys_sparc32.c 2004-02-02 09:54:12.000000000 -0800
903+++ linux-262-rc3-syscalls/arch/sparc64/kernel/sys_sparc32.c 2004-02-02 20:39:40.000000000 -0800
904@@ -47,6 +47,7 @@
905 #include <linux/ipv6.h>
906 #include <linux/in.h>
907 #include <linux/icmpv6.h>
908+#include <linux/syscalls.h>
909 #include <linux/sysctl.h>
910 #include <linux/binfmts.h>
911 #include <linux/dnotify.h>
912@@ -88,15 +89,8 @@
913 __ret; \
914 })
915
916-extern asmlinkage long sys_chown(const char *, uid_t,gid_t);
917-extern asmlinkage long sys_lchown(const char *, uid_t,gid_t);
918-extern asmlinkage long sys_fchown(unsigned int, uid_t,gid_t);
919-extern asmlinkage long sys_setregid(gid_t, gid_t);
920 extern asmlinkage long sys_setgid(gid_t);
921-extern asmlinkage long sys_setreuid(uid_t, uid_t);
922 extern asmlinkage long sys_setuid(uid_t);
923-extern asmlinkage long sys_setresuid(uid_t, uid_t, uid_t);
924-extern asmlinkage long sys_setresgid(gid_t, gid_t, gid_t);
925 extern asmlinkage long sys_setfsuid(uid_t);
926 extern asmlinkage long sys_setfsgid(gid_t);
927
928@@ -795,9 +789,6 @@ out:
929 return err;
930 }
931
932-extern asmlinkage long sys_truncate(const char * path, unsigned long length);
933-extern asmlinkage long sys_ftruncate(unsigned int fd, unsigned long length);
934-
935 asmlinkage int sys32_truncate64(const char * path, unsigned long high, unsigned long low)
936 {
937 if ((int)high < 0)
938@@ -2416,17 +2407,6 @@ asmlinkage int sys32_pause(void)
939 }
940
941 /* PCI config space poking. */
942-extern asmlinkage int sys_pciconfig_read(unsigned long bus,
943- unsigned long dfn,
944- unsigned long off,
945- unsigned long len,
946- unsigned char *buf);
947-
948-extern asmlinkage int sys_pciconfig_write(unsigned long bus,
949- unsigned long dfn,
950- unsigned long off,
951- unsigned long len,
952- unsigned char *buf);
953
954 asmlinkage int sys32_pciconfig_read(u32 bus, u32 dfn, u32 off, u32 len, u32 ubuf)
955 {
956@@ -2446,9 +2426,6 @@ asmlinkage int sys32_pciconfig_write(u32
957 (unsigned char *)AA(ubuf));
958 }
959
960-extern asmlinkage int sys_prctl(int option, unsigned long arg2, unsigned long arg3,
961- unsigned long arg4, unsigned long arg5);
962-
963 asmlinkage int sys32_prctl(int option, u32 arg2, u32 arg3, u32 arg4, u32 arg5)
964 {
965 return sys_prctl(option,
966@@ -2459,12 +2436,6 @@ asmlinkage int sys32_prctl(int option, u
967 }
968
969
970-extern asmlinkage ssize_t sys_pread64(unsigned int fd, char * buf,
971- size_t count, loff_t pos);
972-
973-extern asmlinkage ssize_t sys_pwrite64(unsigned int fd, const char * buf,
974- size_t count, loff_t pos);
975-
976 asmlinkage compat_ssize_t sys32_pread64(unsigned int fd, char *ubuf,
977 compat_size_t count, u32 poshi, u32 poslo)
978 {
979@@ -2477,8 +2448,6 @@ asmlinkage compat_ssize_t sys32_pwrite64
980 return sys_pwrite64(fd, ubuf, count, ((loff_t)AA(poshi) << 32) | AA(poslo));
981 }
982
983-extern asmlinkage ssize_t sys_readahead(int fd, loff_t offset, size_t count);
984-
985 asmlinkage compat_ssize_t sys32_readahead(int fd, u32 offhi, u32 offlo, s32 count)
986 {
987 return sys_readahead(fd, ((loff_t)AA(offhi) << 32) | AA(offlo), count);
988@@ -2495,8 +2464,6 @@ long sys32_fadvise64_64(int fd, u32 offh
989 ((loff_t)AA(lenhi)<<32)|AA(lenlo), advice);
990 }
991
992-extern asmlinkage ssize_t sys_sendfile(int out_fd, int in_fd, off_t *offset, size_t count);
993-
994 asmlinkage int sys32_sendfile(int out_fd, int in_fd, compat_off_t *offset, s32 count)
995 {
996 mm_segment_t old_fs = get_fs();
997@@ -2516,8 +2483,6 @@ asmlinkage int sys32_sendfile(int out_fd
998 return ret;
999 }
1000
1001-extern asmlinkage ssize_t sys_sendfile64(int out_fd, int in_fd, loff_t *offset, size_t count);
1002-
1003 asmlinkage int sys32_sendfile64(int out_fd, int in_fd, compat_loff_t *offset, s32 count)
1004 {
1005 mm_segment_t old_fs = get_fs();
1006@@ -2749,8 +2714,6 @@ asmlinkage long sys32_sysctl(struct __sy
1007 return error;
1008 }
1009
1010-extern long sys_lookup_dcookie(u64 cookie64, char *buf, size_t len);
1011-
1012 long sys32_lookup_dcookie(u32 cookie_high, u32 cookie_low, char *buf, size_t len)
1013 {
1014 return sys_lookup_dcookie((u64)cookie_high << 32 | cookie_low,
1015diff -Naurp -X /home/rddunlap/doc/dontdiff-osdl linux-262-rc3/arch/sparc64/kernel/sys_sparc.c linux-262-rc3-syscalls/arch/sparc64/kernel/sys_sparc.c
1016--- linux-262-rc3/arch/sparc64/kernel/sys_sparc.c 2004-01-08 22:59:43.000000000 -0800
1017+++ linux-262-rc3-syscalls/arch/sparc64/kernel/sys_sparc.c 2004-02-02 10:17:22.000000000 -0800
1018@@ -22,6 +22,7 @@
1019 #include <linux/smp.h>
1020 #include <linux/smp_lock.h>
1021 #include <linux/slab.h>
1022+#include <linux/syscalls.h>
1023 #include <linux/ipc.h>
1024 #include <linux/personality.h>
1025
1026@@ -292,8 +293,6 @@ asmlinkage int sparc64_newuname(struct n
1027 return ret;
1028 }
1029
1030-extern asmlinkage long sys_personality(unsigned long);
1031-
1032 asmlinkage int sparc64_personality(unsigned long personality)
1033 {
1034 int ret;
1035diff -Naurp -X /home/rddunlap/doc/dontdiff-osdl linux-262-rc3/arch/sparc64/kernel/sys_sunos32.c linux-262-rc3-syscalls/arch/sparc64/kernel/sys_sunos32.c
1036--- linux-262-rc3/arch/sparc64/kernel/sys_sunos32.c 2004-01-08 22:59:45.000000000 -0800
1037+++ linux-262-rc3-syscalls/arch/sparc64/kernel/sys_sunos32.c 2004-02-02 10:17:22.000000000 -0800
1038@@ -33,6 +33,7 @@
1039 #include <linux/errno.h>
1040 #include <linux/smp.h>
1041 #include <linux/smp_lock.h>
1042+#include <linux/syscalls.h>
1043
1044 #include <asm/uaccess.h>
1045 #include <asm/page.h>
1046@@ -1200,8 +1201,6 @@ static inline int check_nonblock(int ret
1047 return ret;
1048 }
1049
1050-extern asmlinkage ssize_t sys_read(unsigned int fd, char *buf, unsigned long count);
1051-extern asmlinkage ssize_t sys_write(unsigned int fd, char *buf, unsigned long count);
1052 extern asmlinkage int sys_recv(int fd, void *ubuf, size_t size, unsigned flags);
1053 extern asmlinkage int sys_send(int fd, void *buff, size_t len, unsigned flags);
1054 extern asmlinkage int sys_accept(int fd, struct sockaddr *sa, int *addrlen);
1055diff -Naurp -X /home/rddunlap/doc/dontdiff-osdl linux-262-rc3/arch/sparc64/solaris/ioctl.c linux-262-rc3-syscalls/arch/sparc64/solaris/ioctl.c
1056--- linux-262-rc3/arch/sparc64/solaris/ioctl.c 2004-01-08 22:59:44.000000000 -0800
1057+++ linux-262-rc3-syscalls/arch/sparc64/solaris/ioctl.c 2004-02-02 10:17:22.000000000 -0800
1058@@ -17,6 +17,7 @@
1059 #include <linux/sched.h>
1060 #include <linux/smp.h>
1061 #include <linux/smp_lock.h>
1062+#include <linux/syscalls.h>
1063 #include <linux/ioctl.h>
1064 #include <linux/fs.h>
1065 #include <linux/file.h>
1066@@ -34,8 +35,6 @@
1067 #include "conv.h"
1068 #include "socksys.h"
1069
1070-extern asmlinkage int sys_ioctl(unsigned int fd, unsigned int cmd,
1071- unsigned long arg);
1072 extern asmlinkage int compat_sys_ioctl(unsigned int fd, unsigned int cmd,
1073 u32 arg);
1074 asmlinkage int solaris_ioctl(unsigned int fd, unsigned int cmd, u32 arg);
1075diff -Naurp -X /home/rddunlap/doc/dontdiff-osdl linux-262-rc3/arch/sparc64/solaris/socksys.c linux-262-rc3-syscalls/arch/sparc64/solaris/socksys.c
1076--- linux-262-rc3/arch/sparc64/solaris/socksys.c 2004-01-08 22:59:26.000000000 -0800
1077+++ linux-262-rc3-syscalls/arch/sparc64/solaris/socksys.c 2004-02-02 10:17:22.000000000 -0800
1078@@ -35,9 +35,6 @@
1079 #include "conv.h"
1080 #include "socksys.h"
1081
1082-extern asmlinkage int sys_ioctl(unsigned int fd, unsigned int cmd,
1083- unsigned long arg);
1084-
1085 static int af_inet_protocols[] = {
1086 IPPROTO_ICMP, IPPROTO_ICMP, IPPROTO_IGMP, IPPROTO_IPIP, IPPROTO_TCP,
1087 IPPROTO_EGP, IPPROTO_PUP, IPPROTO_UDP, IPPROTO_IDP, IPPROTO_RAW,
1088diff -Naurp -X /home/rddunlap/doc/dontdiff-osdl linux-262-rc3/arch/sparc64/solaris/timod.c linux-262-rc3-syscalls/arch/sparc64/solaris/timod.c
1089--- linux-262-rc3/arch/sparc64/solaris/timod.c 2004-01-08 22:59:26.000000000 -0800
1090+++ linux-262-rc3-syscalls/arch/sparc64/solaris/timod.c 2004-02-02 10:17:22.000000000 -0800
1091@@ -27,8 +27,6 @@
1092 #include "conv.h"
1093 #include "socksys.h"
1094
1095-extern asmlinkage int sys_ioctl(unsigned int fd, unsigned int cmd,
1096- unsigned long arg);
1097 asmlinkage int solaris_ioctl(unsigned int fd, unsigned int cmd, u32 arg);
1098
1099 static spinlock_t timod_pagelock = SPIN_LOCK_UNLOCKED;
1100diff -Naurp -X /home/rddunlap/doc/dontdiff-osdl linux-262-rc3/arch/x86_64/ia32/ia32_ioctl.c linux-262-rc3-syscalls/arch/x86_64/ia32/ia32_ioctl.c
1101--- linux-262-rc3/arch/x86_64/ia32/ia32_ioctl.c 2004-01-08 22:59:42.000000000 -0800
1102+++ linux-262-rc3-syscalls/arch/x86_64/ia32/ia32_ioctl.c 2004-02-02 10:17:22.000000000 -0800
1103@@ -10,12 +10,11 @@
1104 */
1105
1106 #define INCLUDES
1107+#include <linux/syscalls.h>
1108 #include "compat_ioctl.c"
1109 #include <asm/mtrr.h>
1110 #include <asm/ia32.h>
1111
1112-extern asmlinkage long sys_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg);
1113-
1114 #define CODE
1115 #include "compat_ioctl.c"
1116
1117diff -Naurp -X /home/rddunlap/doc/dontdiff-osdl linux-262-rc3/arch/x86_64/ia32/sys_ia32.c linux-262-rc3-syscalls/arch/x86_64/ia32/sys_ia32.c
1118--- linux-262-rc3/arch/x86_64/ia32/sys_ia32.c 2004-02-02 09:54:13.000000000 -0800
1119+++ linux-262-rc3-syscalls/arch/x86_64/ia32/sys_ia32.c 2004-02-02 10:17:22.000000000 -0800
1120@@ -26,6 +26,7 @@
1121 #include <linux/fs.h>
1122 #include <linux/file.h>
1123 #include <linux/signal.h>
1124+#include <linux/syscalls.h>
1125 #include <linux/resource.h>
1126 #include <linux/times.h>
1127 #include <linux/utsname.h>
1128@@ -236,8 +237,6 @@ sys32_mmap(struct mmap_arg_struct *arg)
1129 return retval;
1130 }
1131
1132-extern asmlinkage long sys_mprotect(unsigned long start,size_t len,unsigned long prot);
1133-
1134 asmlinkage long
1135 sys32_mprotect(unsigned long start, size_t len, unsigned long prot)
1136 {
1137@@ -726,9 +725,6 @@ sys32_old_select(struct sel_arg_struct *
1138 (struct compat_timeval *)A(a.tvp));
1139 }
1140
1141-asmlinkage ssize_t sys_readv(unsigned long,const struct iovec *,unsigned long);
1142-asmlinkage ssize_t sys_writev(unsigned long,const struct iovec *,unsigned long);
1143-
1144 static struct iovec *
1145 get_compat_iovec(struct compat_iovec *iov32, struct iovec *iov_buf, u32 *count, int type, int *errp)
1146 {
1147@@ -870,18 +866,12 @@ int sys32_ni_syscall(int call)
1148
1149 /* 32-bit timeval and related flotsam. */
1150
1151-extern asmlinkage long sys_sysfs(int option, unsigned long arg1,
1152- unsigned long arg2);
1153-
1154 asmlinkage long
1155 sys32_sysfs(int option, u32 arg1, u32 arg2)
1156 {
1157 return sys_sysfs(option, arg1, arg2);
1158 }
1159
1160-extern asmlinkage long sys_mount(char * dev_name, char * dir_name, char * type,
1161- unsigned long new_flags, void *data);
1162-
1163 static char *badfs[] = {
1164 "smbfs", "ncpfs", NULL
1165 };
1166@@ -932,8 +922,6 @@ struct sysinfo32 {
1167 char _f[20-2*sizeof(u32)-sizeof(int)];
1168 };
1169
1170-extern asmlinkage long sys_sysinfo(struct sysinfo *info);
1171-
1172 asmlinkage long
1173 sys32_sysinfo(struct sysinfo32 *info)
1174 {
1175@@ -1157,12 +1145,6 @@ sys32_sysctl(struct sysctl_ia32 *args32)
1176 #endif
1177 }
1178
1179-extern asmlinkage ssize_t sys_pread64(unsigned int fd, char * buf,
1180- size_t count, loff_t pos);
1181-
1182-extern asmlinkage ssize_t sys_pwrite64(unsigned int fd, const char * buf,
1183- size_t count, loff_t pos);
1184-
1185 /* warning: next two assume little endian */
1186 asmlinkage long
1187 sys32_pread(unsigned int fd, char *ubuf, u32 count, u32 poslo, u32 poshi)
1188@@ -1179,8 +1161,6 @@ sys32_pwrite(unsigned int fd, char *ubuf
1189 }
1190
1191
1192-extern asmlinkage long sys_personality(unsigned long);
1193-
1194 asmlinkage long
1195 sys32_personality(unsigned long personality)
1196 {
1197@@ -1194,9 +1174,6 @@ sys32_personality(unsigned long personal
1198 return ret;
1199 }
1200
1201-extern asmlinkage ssize_t sys_sendfile(int out_fd, int in_fd, off_t *offset,
1202- size_t count);
1203-
1204 asmlinkage long
1205 sys32_sendfile(int out_fd, int in_fd, compat_off_t *offset, s32 count)
1206 {
1207@@ -1492,8 +1469,6 @@ asmlinkage long sys32_clone(unsigned int
1208 * Some system calls that need sign extended arguments. This could be done by a generic wrapper.
1209 */
1210
1211-extern off_t sys_lseek (unsigned int fd, off_t offset, unsigned int origin);
1212-
1213 long sys32_lseek (unsigned int fd, int offset, unsigned int whence)
1214 {
1215 return sys_lseek(fd, offset, whence);
1216diff -Naurp -X /home/rddunlap/doc/dontdiff-osdl linux-262-rc3/arch/x86_64/kernel/x8664_ksyms.c linux-262-rc3-syscalls/arch/x86_64/kernel/x8664_ksyms.c
1217--- linux-262-rc3/arch/x86_64/kernel/x8664_ksyms.c 2004-02-02 09:54:13.000000000 -0800
1218+++ linux-262-rc3-syscalls/arch/x86_64/kernel/x8664_ksyms.c 2004-02-02 10:17:22.000000000 -0800
1219@@ -11,6 +11,7 @@
1220 #include <linux/apm_bios.h>
1221 #include <linux/kernel.h>
1222 #include <linux/string.h>
1223+#include <linux/syscalls.h>
1224 #include <linux/tty.h>
1225
1226 #include <asm/semaphore.h>
1227@@ -180,8 +181,6 @@ EXPORT_SYMBOL_NOVERS(memcpy);
1228 EXPORT_SYMBOL_NOVERS(__memcpy);
1229
1230 /* syscall export needed for misdesigned sound drivers. */
1231-extern ssize_t sys_read(unsigned int fd, char * buf, size_t count);
1232-extern off_t sys_lseek(unsigned int fd, off_t offset, unsigned int origin);
1233 EXPORT_SYMBOL(sys_read);
1234 EXPORT_SYMBOL(sys_lseek);
1235 EXPORT_SYMBOL(sys_open);
1236diff -Naurp -X /home/rddunlap/doc/dontdiff-osdl linux-262-rc3/drivers/macintosh/via-pmu.c linux-262-rc3-syscalls/drivers/macintosh/via-pmu.c
1237--- linux-262-rc3/drivers/macintosh/via-pmu.c 2004-01-08 23:00:02.000000000 -0800
1238+++ linux-262-rc3-syscalls/drivers/macintosh/via-pmu.c 2004-02-02 10:13:13.000000000 -0800
1239@@ -44,6 +44,7 @@
1240 #include <linux/interrupt.h>
1241 #include <linux/device.h>
1242 #include <linux/suspend.h>
1243+#include <linux/syscalls.h>
1244 #include <asm/prom.h>
1245 #include <asm/machdep.h>
1246 #include <asm/io.h>
1247@@ -2287,7 +2288,6 @@ restore_via_state(void)
1248 out_8(&via[IER], IER_SET | SR_INT | CB1_INT);
1249 }
1250
1251-extern long sys_sync(void);
1252 extern void pm_prepare_console(void);
1253 extern void pm_restore_console(void);
1254
1255diff -Naurp -X /home/rddunlap/doc/dontdiff-osdl linux-262-rc3/fs/compat.c linux-262-rc3-syscalls/fs/compat.c
1256--- linux-262-rc3/fs/compat.c 2004-01-08 22:59:33.000000000 -0800
1257+++ linux-262-rc3-syscalls/fs/compat.c 2004-02-02 10:13:13.000000000 -0800
1258@@ -28,6 +28,7 @@
1259 #include <linux/init.h>
1260 #include <linux/sockios.h> /* for SIOCDEVPRIVATE */
1261 #include <linux/smp_lock.h>
1262+#include <linux/syscalls.h>
1263 #include <linux/ctype.h>
1264 #include <linux/module.h>
1265 #include <net/sock.h> /* siocdevprivate_ioctl */
1266@@ -494,8 +495,6 @@ static int put_compat_flock64(struct flo
1267 }
1268 #endif
1269
1270-extern asmlinkage long sys_fcntl(unsigned int, unsigned int, unsigned long);
1271-
1272 asmlinkage long compat_sys_fcntl64(unsigned int fd, unsigned int cmd,
1273 unsigned long arg)
1274 {
1275@@ -559,8 +558,6 @@ asmlinkage long compat_sys_fcntl(unsigne
1276 return compat_sys_fcntl64(fd, cmd, arg);
1277 }
1278
1279-extern asmlinkage long sys_io_setup(unsigned nr_reqs, aio_context_t *ctx);
1280-
1281 asmlinkage long
1282 compat_sys_io_setup(unsigned nr_reqs, u32 *ctx32p)
1283 {
1284@@ -580,12 +577,6 @@ compat_sys_io_setup(unsigned nr_reqs, u3
1285 return ret;
1286 }
1287
1288-extern asmlinkage long sys_io_getevents(aio_context_t ctx_id,
1289- long min_nr,
1290- long nr,
1291- struct io_event *events,
1292- struct timespec *timeout);
1293-
1294 asmlinkage long
1295 compat_sys_io_getevents(aio_context_t ctx_id,
1296 unsigned long min_nr,
1297@@ -614,9 +605,6 @@ out:
1298 return ret;
1299 }
1300
1301-extern asmlinkage long sys_io_submit(aio_context_t, long,
1302- struct iocb __user **);
1303-
1304 static inline long
1305 copy_iocb(long nr, u32 *ptr32, u64 *ptr64)
1306 {
1307diff -Naurp -X /home/rddunlap/doc/dontdiff-osdl linux-262-rc3/include/asm-i386/unistd.h linux-262-rc3-syscalls/include/asm-i386/unistd.h
1308--- linux-262-rc3/include/asm-i386/unistd.h 2004-01-08 22:59:45.000000000 -0800
1309+++ linux-262-rc3-syscalls/include/asm-i386/unistd.h 2004-02-02 10:56:29.000000000 -0800
1310@@ -397,6 +397,7 @@ static inline _syscall1(int,close,int,fd
1311 static inline _syscall1(int,_exit,int,exitcode)
1312 static inline _syscall3(pid_t,waitpid,pid_t,pid,int *,wait_stat,int,options)
1313
1314+asmlinkage int sys_modify_ldt(int func, void __user *ptr, unsigned long bytecount);
1315 #endif
1316
1317 /*
1318diff -Naurp -X /home/rddunlap/doc/dontdiff-osdl linux-262-rc3/include/asm-ia64/unistd.h linux-262-rc3-syscalls/include/asm-ia64/unistd.h
1319--- linux-262-rc3/include/asm-ia64/unistd.h 2004-01-08 22:59:09.000000000 -0800
1320+++ linux-262-rc3-syscalls/include/asm-ia64/unistd.h 2004-02-02 10:17:22.000000000 -0800
1321@@ -337,6 +337,11 @@ waitpid (int pid, int * wait_stat, int f
1322 extern int execve (const char *filename, char *const av[], char *const ep[]);
1323 extern pid_t clone (unsigned long flags, void *sp);
1324
1325+extern asmlinkage unsigned long sys_mmap(
1326+ unsigned long addr, unsigned long len,
1327+ int prot, int flags,
1328+ int fd, long off);
1329+
1330 #endif /* __KERNEL_SYSCALLS__ */
1331
1332 /*
1333diff -Naurp -X /home/rddunlap/doc/dontdiff-osdl linux-262-rc3/include/asm-mips/unistd.h linux-262-rc3-syscalls/include/asm-mips/unistd.h
1334--- linux-262-rc3/include/asm-mips/unistd.h 2004-01-08 22:59:05.000000000 -0800
1335+++ linux-262-rc3-syscalls/include/asm-mips/unistd.h 2004-02-02 10:17:22.000000000 -0800
1336@@ -1077,6 +1077,11 @@ static inline pid_t waitpid(int pid, int
1337 return wait4(pid, wait_stat, flags, NULL);
1338 }
1339
1340+extern asmlinkage unsigned long sys_mmap(
1341+ unsigned long addr, size_t len,
1342+ int prot, int flags,
1343+ int fd, off_t offset);
1344+
1345 #endif /* __KERNEL_SYSCALLS__ */
1346 #endif /* !__ASSEMBLY__ */
1347
1348diff -Naurp -X /home/rddunlap/doc/dontdiff-osdl linux-262-rc3/include/asm-parisc/unistd.h linux-262-rc3-syscalls/include/asm-parisc/unistd.h
1349--- linux-262-rc3/include/asm-parisc/unistd.h 2004-01-08 22:59:03.000000000 -0800
1350+++ linux-262-rc3-syscalls/include/asm-parisc/unistd.h 2004-02-02 10:17:22.000000000 -0800
1351@@ -904,6 +904,10 @@ static inline pid_t waitpid(pid_t pid, i
1352 return sys_wait4(pid, wait_stat, options, NULL);
1353 }
1354
1355+extern asmlinkage unsigned long sys_mmap(unsigned long addr, unsigned long len,
1356+ unsigned long prot, unsigned long flags,
1357+ unsigned long fd, unsigned long offset);
1358+
1359 #endif /* __KERNEL_SYSCALLS__ */
1360
1361 #endif /* __ASSEMBLY__ */
1362diff -Naurp -X /home/rddunlap/doc/dontdiff-osdl linux-262-rc3/include/asm-ppc/unistd.h linux-262-rc3-syscalls/include/asm-ppc/unistd.h
1363--- linux-262-rc3/include/asm-ppc/unistd.h 2004-02-02 09:54:22.000000000 -0800
1364+++ linux-262-rc3-syscalls/include/asm-ppc/unistd.h 2004-02-02 10:17:22.000000000 -0800
1365@@ -390,6 +390,10 @@ extern int open(const char *file, int fl
1366 extern int close(int fd);
1367 extern pid_t waitpid(pid_t pid, int *wait_stat, int options);
1368
1369+extern unsigned long sys_mmap(unsigned long addr, size_t len,
1370+ unsigned long prot, unsigned long flags,
1371+ unsigned long fd, off_t offset);
1372+
1373 #endif /* __KERNEL_SYSCALLS__ */
1374
1375 /*
1376diff -Naurp -X /home/rddunlap/doc/dontdiff-osdl linux-262-rc3/include/asm-ppc64/unistd.h linux-262-rc3-syscalls/include/asm-ppc64/unistd.h
1377--- linux-262-rc3/include/asm-ppc64/unistd.h 2004-02-02 09:54:23.000000000 -0800
1378+++ linux-262-rc3-syscalls/include/asm-ppc64/unistd.h 2004-02-02 10:17:22.000000000 -0800
1379@@ -405,6 +405,10 @@ extern int open(const char *file, int fl
1380 extern int close(int fd);
1381 extern pid_t waitpid(pid_t pid, int *wait_stat, int options);
1382
1383+extern unsigned long sys_mmap(unsigned long addr, size_t len,
1384+ unsigned long prot, unsigned long flags,
1385+ unsigned long fd, off_t offset);
1386+
1387 #endif /* __KERNEL_SYSCALLS__ */
1388
1389 /*
1390diff -Naurp -X /home/rddunlap/doc/dontdiff-osdl linux-262-rc3/include/asm-sparc/unistd.h linux-262-rc3-syscalls/include/asm-sparc/unistd.h
1391--- linux-262-rc3/include/asm-sparc/unistd.h 2004-01-08 22:59:08.000000000 -0800
1392+++ linux-262-rc3-syscalls/include/asm-sparc/unistd.h 2004-02-02 10:17:22.000000000 -0800
1393@@ -450,6 +450,11 @@ static __inline__ _syscall1(int,close,in
1394 static __inline__ _syscall1(int,_exit,int,exitcode)
1395 static __inline__ _syscall3(pid_t,waitpid,pid_t,pid,int *,wait_stat,int,options)
1396
1397+extern asmlinkage unsigned long sys_mmap(
1398+ unsigned long addr, unsigned long len,
1399+ unsigned long prot, unsigned long flags,
1400+ unsigned long fd, unsigned long off);
1401+
1402 #endif /* __KERNEL_SYSCALLS__ */
1403
1404 /*
1405diff -Naurp -X /home/rddunlap/doc/dontdiff-osdl linux-262-rc3/include/asm-sparc64/unistd.h linux-262-rc3-syscalls/include/asm-sparc64/unistd.h
1406--- linux-262-rc3/include/asm-sparc64/unistd.h 2004-01-08 22:59:10.000000000 -0800
1407+++ linux-262-rc3-syscalls/include/asm-sparc64/unistd.h 2004-02-02 10:17:22.000000000 -0800
1408@@ -440,6 +440,11 @@ static __inline__ _syscall1(int,close,in
1409 static __inline__ _syscall1(int,_exit,int,exitcode)
1410 static __inline__ _syscall3(pid_t,waitpid,pid_t,pid,int *,wait_stat,int,options)
1411
1412+extern asmlinkage unsigned long sys_mmap(
1413+ unsigned long addr, unsigned long len,
1414+ unsigned long prot, unsigned long flags,
1415+ unsigned long fd, unsigned long off);
1416+
1417 #endif /* __KERNEL_SYSCALLS__ */
1418
1419 #ifdef __KERNEL__
1420diff -Naurp -X /home/rddunlap/doc/dontdiff-osdl linux-262-rc3/include/asm-v850/unistd.h linux-262-rc3-syscalls/include/asm-v850/unistd.h
1421--- linux-262-rc3/include/asm-v850/unistd.h 2004-01-08 23:00:04.000000000 -0800
1422+++ linux-262-rc3-syscalls/include/asm-v850/unistd.h 2004-02-02 10:17:22.000000000 -0800
1423@@ -417,6 +417,10 @@ extern inline pid_t wait(int * wait_stat
1424 return waitpid (-1, wait_stat, 0);
1425 }
1426
1427+extern unsigned long sys_mmap(unsigned long addr, size_t len,
1428+ unsigned long prot, unsigned long flags,
1429+ unsigned long fd, off_t offset);
1430+
1431 #endif
1432
1433 /*
1434diff -Naurp -X /home/rddunlap/doc/dontdiff-osdl linux-262-rc3/include/asm-x86_64/unistd.h linux-262-rc3-syscalls/include/asm-x86_64/unistd.h
1435--- linux-262-rc3/include/asm-x86_64/unistd.h 2004-02-02 09:54:23.000000000 -0800
1436+++ linux-262-rc3-syscalls/include/asm-x86_64/unistd.h 2004-02-02 10:55:41.000000000 -0800
1437@@ -709,6 +709,12 @@ static inline pid_t waitpid(int pid, int
1438 return sys_wait4(pid, wait_stat, flags, NULL);
1439 }
1440
1441+extern long sys_mmap(unsigned long addr, unsigned long len,
1442+ unsigned long prot, unsigned long flags,
1443+ unsigned long fd, unsigned long off);
1444+
1445+extern int sys_modify_ldt(int func, void *ptr, unsigned long bytecount);
1446+
1447 #endif /* __KERNEL_SYSCALLS__ */
1448
1449 #endif /* __NO_STUBS */
1450diff -Naurp -X /home/rddunlap/doc/dontdiff-osdl linux-262-rc3/include/linux/syscalls.h linux-262-rc3-syscalls/include/linux/syscalls.h
1451--- linux-262-rc3/include/linux/syscalls.h 1969-12-31 16:00:00.000000000 -0800
1452+++ linux-262-rc3-syscalls/include/linux/syscalls.h 2004-02-02 20:43:23.000000000 -0800
1453@@ -0,0 +1,458 @@
1454+/*
1455+ * syscalls.h - Linux syscall interfaces (non-arch-specific)
1456+ *
1457+ * Copyright (c) 2004 Randy Dunlap
1458+ * Copyright (c) 2004 Open Source Development Labs
1459+ *
1460+ * This file is released under the GPLv2.
1461+ * See the file COPYING for more details.
1462+ */
1463+
1464+#ifndef _LINUX_SYSCALLS_H
1465+#define _LINUX_SYSCALLS_H
1466+
1467+struct compat_timespec;
1468+struct epoll_event;
1469+struct iattr;
1470+struct inode;
1471+struct iocb;
1472+struct io_event;
1473+struct iovec;
1474+struct itimerspec;
1475+struct itimerval;
1476+struct linux_dirent;
1477+struct linux_dirent64;
1478+struct list_head;
1479+struct msghdr;
1480+struct new_utsname;
1481+struct nfsctl_arg;
1482+struct __old_kernel_stat;
1483+struct pollfd;
1484+struct rlimit;
1485+struct rusage;
1486+struct sched_param;
1487+struct semaphore;
1488+struct sockaddr;
1489+struct stat;
1490+struct stat64;
1491+struct __sysctl_args;
1492+struct sysinfo;
1493+struct timespec;
1494+struct timeval;
1495+struct timex;
1496+struct timezone;
1497+struct tms;
1498+struct utimbuf;
1499+
1500+#include <linux/types.h>
1501+#include <linux/aio_abi.h>
1502+#include <linux/capability.h>
1503+#include <linux/list.h>
1504+#include <asm/semaphore.h>
1505+#include <asm/siginfo.h>
1506+#include <asm/signal.h>
1507+#include <linux/quota.h>
1508+
1509+asmlinkage long sys_time(int *tloc);
1510+asmlinkage long sys_stime(time_t *tptr);
1511+asmlinkage long sys_gettimeofday(struct timeval __user *tv,
1512+ struct timezone __user *tz);
1513+asmlinkage long sys_settimeofday(struct timeval __user *tv,
1514+ struct timezone __user *tz);
1515+asmlinkage long sys_adjtimex(struct timex __user *txc_p);
1516+
1517+asmlinkage long sys_times(struct tms __user *tbuf);
1518+
1519+asmlinkage long sys_gettid(void);
1520+asmlinkage long sys_nanosleep(struct timespec *rqtp, struct timespec *rmtp);
1521+#if !defined(__alpha__) && !defined(__ia64__)
1522+asmlinkage unsigned long sys_alarm(unsigned int seconds);
1523+#endif
1524+asmlinkage long sys_getpid(void);
1525+asmlinkage long sys_getppid(void);
1526+asmlinkage long sys_getuid(void);
1527+asmlinkage long sys_geteuid(void);
1528+asmlinkage long sys_getgid(void);
1529+asmlinkage long sys_getegid(void);
1530+asmlinkage long sys_getresuid(uid_t *ruid, uid_t *euid, uid_t *suid);
1531+asmlinkage long sys_getresgid(gid_t *rgid, gid_t *egid, gid_t *sgid);
1532+asmlinkage long sys_getpgid(pid_t pid);
1533+asmlinkage long sys_getpgrp(void);
1534+asmlinkage long sys_getsid(pid_t pid);
1535+asmlinkage long sys_getgroups(int gidsetsize, gid_t __user *grouplist);
1536+
1537+asmlinkage long sys_setregid(gid_t rgid, gid_t egid);
1538+asmlinkage long sys_setgid(gid_t gid);
1539+asmlinkage long sys_setreuid(uid_t ruid, uid_t euid);
1540+asmlinkage long sys_setuid(uid_t uid);
1541+asmlinkage long sys_setresuid(uid_t ruid, uid_t euid, uid_t suid);
1542+asmlinkage long sys_setresgid(gid_t rgid, gid_t egid, gid_t sgid);
1543+asmlinkage long sys_setfsuid(uid_t uid);
1544+asmlinkage long sys_setfsgid(gid_t gid);
1545+asmlinkage long sys_setpgid(pid_t pid, pid_t pgid);
1546+asmlinkage long sys_setsid(void);
1547+asmlinkage long sys_setgroups(int gidsetsize, gid_t __user *grouplist);
1548+
1549+asmlinkage long sys_acct(const char *name);
1550+asmlinkage long sys_capget(cap_user_header_t header,
1551+ cap_user_data_t dataptr);
1552+asmlinkage long sys_capset(cap_user_header_t header,
1553+ const cap_user_data_t data);
1554+asmlinkage long sys_personality(u_long personality);
1555+
1556+asmlinkage long sys_sigpending(old_sigset_t *);
1557+asmlinkage long sys_sigprocmask(int, old_sigset_t *, old_sigset_t *);
1558+asmlinkage long sys_getitimer(int which, struct itimerval __user *value);
1559+asmlinkage long sys_setitimer(int which,
1560+ struct itimerval __user *value,
1561+ struct itimerval __user *ovalue);
1562+asmlinkage long sys_timer_gettime(timer_t timer_id,
1563+ struct itimerspec __user *setting);
1564+asmlinkage long sys_timer_getoverrun(timer_t timer_id);
1565+asmlinkage long sys_timer_settime(timer_t timer_id, int flags,
1566+ const struct itimerspec __user *new_setting,
1567+ struct itimerspec __user *old_setting);
1568+asmlinkage long sys_timer_delete(timer_t timer_id);
1569+asmlinkage long sys_clock_settime(clockid_t which_clock,
1570+ const struct timespec __user *tp);
1571+asmlinkage long sys_clock_gettime(clockid_t which_clock,
1572+ struct timespec __user *tp);
1573+asmlinkage long sys_clock_getres(clockid_t which_clock,
1574+ struct timespec __user *tp);
1575+asmlinkage long sys_clock_nanosleep(clockid_t which_clock, int flags,
1576+ const struct timespec __user *rqtp,
1577+ struct timespec __user *rmtp);
1578+
1579+#ifndef __alpha__
1580+asmlinkage long sys_nice(int increment);
1581+#endif
1582+asmlinkage long sys_sched_setscheduler(pid_t pid, int policy,
1583+ struct sched_param __user *param);
1584+asmlinkage long sys_sched_setparam(pid_t pid,
1585+ struct sched_param __user *param);
1586+asmlinkage long sys_sched_getscheduler(pid_t pid);
1587+asmlinkage long sys_sched_getparam(pid_t pid,
1588+ struct sched_param __user *param);
1589+asmlinkage long sys_sched_setaffinity(pid_t pid, unsigned int len,
1590+ unsigned long __user *user_mask_ptr);
1591+asmlinkage long sys_sched_getaffinity(pid_t pid, unsigned int len,
1592+ unsigned long __user *user_mask_ptr);
1593+asmlinkage long sys_sched_yield(void);
1594+asmlinkage long sys_sched_get_priority_max(int policy);
1595+asmlinkage long sys_sched_get_priority_min(int policy);
1596+asmlinkage long sys_sched_rr_get_interval(pid_t pid,
1597+ struct timespec __user *interval);
1598+asmlinkage long sys_setpriority(int which, int who, int niceval);
1599+asmlinkage long sys_getpriority(int which, int who);
1600+
1601+asmlinkage long sys_reboot(int magic1, int magic2, unsigned int cmd,
1602+ void __user *arg);
1603+
1604+asmlinkage long sys_exit(int error_code);
1605+asmlinkage void sys_exit_group(int error_code);
1606+asmlinkage long sys_wait4(pid_t pid, unsigned int *stat_addr,
1607+ int options, struct rusage *ru);
1608+#if !defined(__alpha__) && !defined(__ia64__) && !defined(__arm__)
1609+asmlinkage long sys_waitpid(pid_t pid, unsigned int *stat_addr, int options);
1610+#endif
1611+asmlinkage long sys_set_tid_address(int __user *tidptr);
1612+asmlinkage long sys_futex(u32 __user *uaddr, int op, int val,
1613+ struct timespec __user *utime, u32 __user *uaddr2);
1614+#ifdef CONFIG_FUTEX
1615+asmlinkage long compat_sys_futex(u32 *uaddr, int op, int val,
1616+ struct compat_timespec *utime, u32 *uaddr2);
1617+#endif
1618+
1619+asmlinkage long sys_init_module(void __user *umod, unsigned long len,
1620+ const char __user *uargs);
1621+asmlinkage long sys_delete_module(const char __user *name_user,
1622+ unsigned int flags);
1623+
1624+asmlinkage long sys_restart_syscall(void);
1625+asmlinkage long sys_rt_sigprocmask(int how, sigset_t __user *set,
1626+ sigset_t __user *oset, size_t sigsetsize);
1627+asmlinkage long sys_rt_sigpending(sigset_t __user *set, size_t sigsetsize);
1628+asmlinkage long sys_rt_sigtimedwait(const sigset_t __user *uthese,
1629+ siginfo_t __user *uinfo,
1630+ const struct timespec __user *uts,
1631+ size_t sigsetsize);
1632+asmlinkage long sys_kill(int pid, int sig);
1633+asmlinkage long sys_tgkill(int tgid, int pid, int sig);
1634+asmlinkage long sys_tkill(int pid, int sig);
1635+asmlinkage long sys_rt_sigqueueinfo(int pid, int sig, siginfo_t __user *uinfo);
1636+asmlinkage long sys_sigpending(old_sigset_t __user *set);
1637+#if !defined(__alpha__)
1638+asmlinkage long sys_sigprocmask(int how, old_sigset_t __user *set,
1639+ old_sigset_t __user *oset);
1640+#endif
1641+#ifndef __sparc__
1642+asmlinkage long sys_rt_sigaction(int sig,
1643+ const struct sigaction __user *act,
1644+ struct sigaction __user *oact,
1645+ size_t sigsetsize);
1646+#endif
1647+#if !defined(__alpha__) && !defined(__ia64__) && !defined(__arm__)
1648+asmlinkage long sys_sgetmask(void);
1649+asmlinkage long sys_ssetmask(int newmask);
1650+#endif
1651+#if !defined(__alpha__) && !defined(__ia64__) && !defined(__mips__) && \
1652+ !defined(__arm__)
1653+asmlinkage unsigned long
1654+sys_signal(int sig, __sighandler_t handler);
1655+#endif
1656+#ifndef HAVE_ARCH_SYS_PAUSE
1657+asmlinkage long sys_pause(void);
1658+#endif
1659+
1660+asmlinkage long sys_sync(void);
1661+asmlinkage long sys_fsync(unsigned int fd);
1662+asmlinkage long sys_fdatasync(unsigned int fd);
1663+asmlinkage long sys_bdflush(int func, long data);
1664+asmlinkage long sys_mount(char __user *dev_name, char __user *dir_name,
1665+ char __user *type, unsigned long flags,
1666+ void __user *data);
1667+asmlinkage long sys_umount(char __user *name, int flags);
1668+asmlinkage long sys_oldumount(char __user *name);
1669+asmlinkage long sys_pivot_root(const char __user *new_root,
1670+ const char __user *put_old);
1671+asmlinkage long sys_truncate(const char __user *path,
1672+ unsigned long length);
1673+asmlinkage long sys_ftruncate(unsigned int fd, unsigned long length);
1674+asmlinkage long sys_stat(char __user *filename,
1675+ struct __old_kernel_stat __user *statbuf);
1676+asmlinkage long sys_lstat(char __user *filename,
1677+ struct __old_kernel_stat __user *statbuf);
1678+asmlinkage long sys_fstat(unsigned int fd,
1679+ struct __old_kernel_stat __user *statbuf);
1680+asmlinkage long sys_newstat(char __user *filename,
1681+ struct stat __user *statbuf);
1682+asmlinkage long sys_newlstat(char __user *filename,
1683+ struct stat __user *statbuf);
1684+asmlinkage long sys_newfstat(unsigned int fd, struct stat __user *statbuf);
1685+asmlinkage long sys_ustat(unsigned dev, struct ustat __user *ubuf);
1686+#if BITS_PER_LONG == 32
1687+asmlinkage long sys_stat64(char __user *filename,
1688+ struct stat64 __user *statbuf);
1689+asmlinkage long sys_fstat64(unsigned long fd, struct stat64 __user *statbuf);
1690+asmlinkage long sys_lstat64(char __user *filename,
1691+ struct stat64 __user *statbuf);
1692+asmlinkage long sys_truncate64(const char __user *path, loff_t length);
1693+asmlinkage long sys_ftruncate64(unsigned int fd, loff_t length);
1694+#endif
1695+
1696+asmlinkage long sys_setxattr(char __user *path, char __user *name,
1697+ void __user *value, size_t size, int flags);
1698+asmlinkage long sys_lsetxattr(char __user *path, char __user *name,
1699+ void __user *value, size_t size, int flags);
1700+asmlinkage long sys_fsetxattr(int fd, char __user *name, void __user *value,
1701+ size_t size, int flags);
1702+asmlinkage ssize_t sys_getxattr(char __user *path, char __user *name,
1703+ void __user *value, size_t size);
1704+asmlinkage ssize_t sys_lgetxattr(char __user *path, char __user *name,
1705+ void __user *value, size_t size);
1706+asmlinkage ssize_t sys_fgetxattr(int fd, char __user *name,
1707+ void __user *value, size_t size);
1708+asmlinkage ssize_t sys_listxattr(char __user *path, char __user *list,
1709+ size_t size);
1710+asmlinkage ssize_t sys_llistxattr(char __user *path, char __user *list,
1711+ size_t size);
1712+asmlinkage ssize_t sys_flistxattr(int fd, char __user *list, size_t size);
1713+asmlinkage long sys_removexattr(char __user *path, char __user *name);
1714+asmlinkage long sys_lremovexattr(char __user *path, char __user *name);
1715+asmlinkage long sys_fremovexattr(int fd, char __user *name);
1716+
1717+asmlinkage long sys_mprotect(unsigned long start, size_t len,
1718+ unsigned long prot);
1719+/////extern asmlinkage long sys_mmap(); ///// <<<<<<<<<<<<<<<<<<<<<<<< ?????
1720+///// do some unistd.h need to #include syscalls.h ?
1721+///// check asm-*/unistd.h for externs that need to be removed.
1722+asmlinkage unsigned long sys_mremap(unsigned long addr,
1723+ unsigned long old_len, unsigned long new_len,
1724+ unsigned long flags, unsigned long new_addr);
1725+asmlinkage long sys_munmap(unsigned long addr, size_t len);
1726+asmlinkage long sys_chroot(const char __user *filename);
1727+asmlinkage long sys_mknod(const char __user *filename, int mode,
1728+ unsigned dev);
1729+asmlinkage long sys_link(const char __user *oldname,
1730+ const char __user *newname);
1731+asmlinkage long sys_symlink(const char *old, const char *new);
1732+asmlinkage long sys_unlink(const char __user *pathname);
1733+asmlinkage long sys_rename(const char __user *oldname,
1734+ const char __user *newname);
1735+asmlinkage long sys_chmod(const char __user *filename, mode_t mode);
1736+asmlinkage long sys_fchmod(unsigned int fd, mode_t mode);
1737+
1738+asmlinkage long sys_fcntl(unsigned int fd, unsigned int cmd, unsigned long arg);
1739+#if BITS_PER_LONG == 32
1740+asmlinkage long sys_fcntl64(unsigned int fd,
1741+ unsigned int cmd, unsigned long arg);
1742+#endif
1743+asmlinkage long sys_dup(unsigned int fildes);
1744+asmlinkage long sys_dup2(unsigned int oldfd, unsigned int newfd);
1745+asmlinkage long sys_ioctl(unsigned int fd, unsigned int cmd,
1746+ unsigned long arg);
1747+asmlinkage long sys_flock(unsigned int fd, unsigned int cmd);
1748+asmlinkage long sys_io_setup(unsigned nr_reqs, aio_context_t *ctx);
1749+asmlinkage long sys_io_destroy(aio_context_t ctx);
1750+asmlinkage long sys_io_getevents(aio_context_t ctx_id,
1751+ long min_nr,
1752+ long nr,
1753+ struct io_event *events,
1754+ struct timespec *timeout);
1755+asmlinkage long sys_io_submit(aio_context_t, long,
1756+ struct iocb __user **);
1757+asmlinkage long sys_io_cancel(aio_context_t ctx_id, struct iocb *iocb,
1758+ struct io_event *result);
1759+asmlinkage ssize_t sys_sendfile(int out_fd, int in_fd,
1760+ off_t __user *offset, size_t count);
1761+asmlinkage ssize_t sys_sendfile64(int out_fd, int in_fd,
1762+ loff_t __user *offset, size_t count);
1763+asmlinkage long sys_readlink(const char __user *path,
1764+ char __user *buf, int bufsiz);
1765+asmlinkage long sys_creat(const char __user *pathname, int mode);
1766+asmlinkage long sys_open(const char __user *filename,
1767+ int flags, int mode);
1768+asmlinkage long sys_close(unsigned int fd);
1769+asmlinkage long sys_access(const char __user *filename, int mode);
1770+asmlinkage long sys_vhangup(void);
1771+asmlinkage long sys_chown(const char __user *filename,
1772+ uid_t user, gid_t group);
1773+asmlinkage long sys_lchown(const char __user *filename,
1774+ uid_t user, gid_t group);
1775+asmlinkage long sys_fchown(unsigned int fd, uid_t user, gid_t group);
1776+asmlinkage long sys_chown16(const char *filename,
1777+ old_uid_t user, old_gid_t group);
1778+asmlinkage long sys_lchown16(const char *filename,
1779+ old_uid_t user, old_gid_t group);
1780+asmlinkage long sys_fchown16(unsigned int fd, old_uid_t user, old_gid_t group);
1781+asmlinkage long sys_setregid16(old_gid_t rgid, old_gid_t egid);
1782+asmlinkage long sys_setgid16(old_gid_t gid);
1783+asmlinkage long sys_setreuid16(old_uid_t ruid, old_uid_t euid);
1784+asmlinkage long sys_setuid16(old_uid_t uid);
1785+asmlinkage long sys_setresuid16(old_uid_t ruid, old_uid_t euid, old_uid_t suid);
1786+asmlinkage long sys_getresuid16(old_uid_t *ruid,
1787+ old_uid_t *euid, old_uid_t *suid);
1788+asmlinkage long sys_setresgid16(old_gid_t rgid, old_gid_t egid, old_gid_t sgid);
1789+asmlinkage long sys_getresgid16(old_gid_t *rgid,
1790+ old_gid_t *egid, old_gid_t *sgid);
1791+asmlinkage long sys_setfsuid16(old_uid_t uid);
1792+asmlinkage long sys_setfsgid16(old_gid_t gid);
1793+asmlinkage long sys_getgroups16(int gidsetsize, old_gid_t __user *grouplist);
1794+asmlinkage long sys_setgroups16(int gidsetsize, old_gid_t __user *grouplist);
1795+asmlinkage long sys_getuid16(void);
1796+asmlinkage long sys_geteuid16(void);
1797+asmlinkage long sys_getgid16(void);
1798+asmlinkage long sys_getegid16(void);
1799+
1800+asmlinkage long sys_utime(char __user *filename,
1801+ struct utimbuf __user *times);
1802+asmlinkage long sys_utimes(char __user *filename,
1803+ struct timeval __user *utimes);
1804+asmlinkage off_t sys_lseek(unsigned int fd, off_t offset,
1805+ unsigned int origin);
1806+#if !defined(__alpha__)
1807+asmlinkage long sys_llseek(unsigned int fd, unsigned long offset_high,
1808+ unsigned long offset_low, loff_t __user *result,
1809+ unsigned int origin);
1810+#endif
1811+asmlinkage ssize_t sys_read(unsigned int fd, char __user *buf,
1812+ size_t count);
1813+asmlinkage ssize_t sys_readahead(int fd, loff_t offset, size_t count);
1814+asmlinkage ssize_t sys_readv(unsigned long fd,
1815+ const struct iovec __user *vec,
1816+ unsigned long vlen);
1817+asmlinkage ssize_t sys_write(unsigned int fd, const char __user *buf,
1818+ size_t count);
1819+asmlinkage ssize_t sys_writev(unsigned long fd,
1820+ const struct iovec __user *vec,
1821+ unsigned long vlen);
1822+asmlinkage ssize_t sys_pread64(unsigned int fd, char __user *buf,
1823+ size_t count, loff_t pos);
1824+asmlinkage ssize_t sys_pwrite64(unsigned int fd, const char __user *buf,
1825+ size_t count, loff_t pos);
1826+asmlinkage long sys_getcwd(char __user *buf, unsigned long size);
1827+asmlinkage long sys_mkdir(const char __user *pathname, int mode);
1828+asmlinkage long sys_chdir(const char __user *filename);
1829+asmlinkage long sys_fchdir(unsigned int fd);
1830+asmlinkage long sys_rmdir(const char __user *pathname);
1831+asmlinkage long sys_lookup_dcookie(u64 cookie64, char *buf, size_t len);
1832+asmlinkage long sys_quotactl(unsigned int cmd, const char *special,
1833+ qid_t id, caddr_t addr);
1834+asmlinkage long sys_getdents(unsigned int fd,
1835+ struct linux_dirent __user *dirent,
1836+ unsigned int count);
1837+asmlinkage long sys_getdents64(unsigned int fd,
1838+ struct linux_dirent64 __user *dirent,
1839+ unsigned int count);
1840+
1841+asmlinkage long sys_setsockopt(int fd, int level, int optname,
1842+ char *optval, int optlen);
1843+asmlinkage long sys_getsockopt(int fd, int level, int optname,
1844+ void *optval, int *optlen);
1845+asmlinkage long sys_bind(int, struct sockaddr *, int);
1846+asmlinkage long sys_connect(int, struct sockaddr *, int);
1847+asmlinkage long sys_accept(int, struct sockaddr *, int *);
1848+asmlinkage long sys_getsockname(int, struct sockaddr *, int *);
1849+asmlinkage long sys_getpeername(int, struct sockaddr *, int *);
1850+asmlinkage long sys_send(int, void *, size_t, unsigned);
1851+asmlinkage long sys_sendto(int, void *, size_t, unsigned,
1852+ struct sockaddr *, int);
1853+asmlinkage long sys_sendmsg(int fd, struct msghdr __user *msg, unsigned flags);
1854+asmlinkage long sys_recv(int, void *, size_t, unsigned);
1855+asmlinkage long sys_recvfrom(int, void *, size_t, unsigned,
1856+ struct sockaddr *, int *);
1857+asmlinkage long sys_recvmsg(int fd, struct msghdr __user *msg,
1858+ unsigned int flags);
1859+asmlinkage long sys_socket(int, int, int);
1860+asmlinkage long sys_socketpair(int, int, int, int [2]);
1861+asmlinkage long sys_socketcall(int call, unsigned long __user *args);
1862+asmlinkage long sys_shutdown(int, int);
1863+asmlinkage long sys_listen(int, int);
1864+asmlinkage long sys_poll(struct pollfd __user *ufds, unsigned int nfds,
1865+ long timeout);
1866+asmlinkage long sys_select(int n, fd_set __user *inp, fd_set __user *outp,
1867+ fd_set __user *exp, struct timeval __user *tvp);
1868+asmlinkage long sys_epoll_create(int size);
1869+asmlinkage long sys_epoll_ctl(int epfd, int op, int fd,
1870+ struct epoll_event __user *event);
1871+asmlinkage long sys_epoll_wait(int epfd, struct epoll_event __user *events,
1872+ int maxevents, int timeout);
1873+asmlinkage long sys_gethostname(char __user *name, int len);
1874+asmlinkage long sys_sethostname(char __user *name, int len);
1875+asmlinkage long sys_setdomainname(char __user *name, int len);
1876+asmlinkage long sys_newuname(struct new_utsname __user *name);
1877+
1878+asmlinkage long sys_getrlimit(unsigned int resource,
1879+ struct rlimit __user *rlim);
1880+#if defined(COMPAT_RLIM_OLD_INFINITY) || !(defined(CONFIG_IA64) || defined(CONFIG_V850))
1881+asmlinkage long sys_old_getrlimit(unsigned int resource, struct rlimit __user *rlim);
1882+#endif
1883+asmlinkage long sys_setrlimit(unsigned int resource,
1884+ struct rlimit __user *rlim);
1885+asmlinkage long sys_getrusage(int who, struct rusage __user *ru);
1886+asmlinkage long sys_umask(int mask);
1887+asmlinkage long sys_prctl(int option, unsigned long arg2, unsigned long arg3,
1888+ unsigned long arg4, unsigned long arg5);
1889+
1890+asmlinkage long sys_pciconfig_iobase(long which, unsigned long bus, unsigned long devfn);
1891+asmlinkage long sys_pciconfig_read(unsigned long bus, unsigned long dfn,
1892+ unsigned long off, unsigned long len,
1893+ void *buf);
1894+asmlinkage long sys_pciconfig_write(unsigned long bus, unsigned long dfn,
1895+ unsigned long off, unsigned long len,
1896+ void *buf);
1897+
1898+asmlinkage long sys_swapon(const char __user *specialfile, int swap_flags);
1899+asmlinkage long sys_swapoff(const char __user *specialfile);
1900+asmlinkage long sys_sysctl(struct __sysctl_args __user *args);
1901+asmlinkage long sys_sysinfo(struct sysinfo __user *info);
1902+asmlinkage long sys_sysfs(int option,
1903+ unsigned long arg1, unsigned long arg2);
1904+asmlinkage long sys_nfsservctl(int cmd,
1905+ struct nfsctl_arg __user *arg,
1906+ void __user *res);
1907+asmlinkage long sys_syslog(int type, char __user *buf, int len);
1908+asmlinkage long sys_uselib(const char __user *library);
1909+asmlinkage long sys_ni_syscall(void);
1910+
1911+#endif
1912diff -Naurp -X /home/rddunlap/doc/dontdiff-osdl linux-262-rc3/include/linux/sysctl.h linux-262-rc3-syscalls/include/linux/sysctl.h
1913--- linux-262-rc3/include/linux/sysctl.h 2004-02-02 09:54:24.000000000 -0800
1914+++ linux-262-rc3-syscalls/include/linux/sysctl.h 2004-02-02 10:13:13.000000000 -0800
1915@@ -715,7 +715,6 @@ enum
1916
1917 #ifdef __KERNEL__
1918
1919-extern asmlinkage long sys_sysctl(struct __sysctl_args __user *);
1920 extern void sysctl_init(void);
1921
1922 typedef struct ctl_table ctl_table;
1923diff -Naurp -X /home/rddunlap/doc/dontdiff-osdl linux-262-rc3/init/do_mounts_devfs.c linux-262-rc3-syscalls/init/do_mounts_devfs.c
1924--- linux-262-rc3/init/do_mounts_devfs.c 2004-01-08 22:59:48.000000000 -0800
1925+++ linux-262-rc3-syscalls/init/do_mounts_devfs.c 2004-02-02 14:55:28.000000000 -0800
1926@@ -2,14 +2,10 @@
1927 #include <linux/kernel.h>
1928 #include <linux/dirent.h>
1929 #include <linux/string.h>
1930+#include <linux/syscalls.h>
1931
1932 #include "do_mounts.h"
1933
1934-extern asmlinkage long sys_symlink(const char *old, const char *new);
1935-extern asmlinkage long sys_access(const char * filename, int mode);
1936-extern asmlinkage long sys_getdents64(unsigned int fd, void * dirent,
1937- unsigned int count);
1938-
1939 void __init mount_devfs(void)
1940 {
1941 sys_mount("devfs", "/dev", "devfs", 0, NULL);
1942@@ -31,7 +27,8 @@ static int __init do_read_dir(int fd, vo
1943 lseek(fd, 0, 0);
1944
1945 for (bytes = 0; bytes < len; bytes += n) {
1946- n = sys_getdents64(fd, p + bytes, len - bytes);
1947+ n = sys_getdents64(fd, (struct linux_dirent64 *)(p + bytes),
1948+ len - bytes);
1949 if (n < 0)
1950 return n;
1951 if (n == 0)
1952diff -Naurp -X /home/rddunlap/doc/dontdiff-osdl linux-262-rc3/init/do_mounts.h linux-262-rc3-syscalls/init/do_mounts.h
1953--- linux-262-rc3/init/do_mounts.h 2004-01-08 22:59:45.000000000 -0800
1954+++ linux-262-rc3-syscalls/init/do_mounts.h 2004-02-02 10:13:13.000000000 -0800
1955@@ -3,25 +3,13 @@
1956 #include <linux/kernel.h>
1957 #include <linux/devfs_fs_kernel.h>
1958 #include <linux/init.h>
1959+#include <linux/syscalls.h>
1960 #include <linux/unistd.h>
1961 #include <linux/slab.h>
1962 #include <linux/mount.h>
1963 #include <linux/major.h>
1964 #include <linux/root_dev.h>
1965
1966-asmlinkage long sys_unlink(const char *name);
1967-asmlinkage long sys_mknod(const char *name, int mode, unsigned dev);
1968-asmlinkage long sys_newstat(char * filename, struct stat * statbuf);
1969-asmlinkage long sys_ioctl(int fd, int cmd, unsigned long arg);
1970-asmlinkage long sys_mkdir(const char *name, int mode);
1971-asmlinkage long sys_rmdir(const char *name);
1972-asmlinkage long sys_chdir(const char *name);
1973-asmlinkage long sys_fchdir(int fd);
1974-asmlinkage long sys_chroot(const char *name);
1975-asmlinkage long sys_mount(char *dev_name, char *dir_name, char *type,
1976- unsigned long flags, void *data);
1977-asmlinkage long sys_umount(char *name, int flags);
1978-
1979 dev_t name_to_dev_t(char *name);
1980 void change_floppy(char *fmt, ...);
1981 void mount_block_root(char *name, int flags);
1982@@ -49,7 +37,6 @@ static inline int create_dev(char *name,
1983 #endif
1984
1985 #if BITS_PER_LONG == 32
1986-asmlinkage long sys_stat64(char *name, struct stat64 *stat);
1987 static inline u32 bstat(char *name)
1988 {
1989 struct stat64 stat;
1990diff -Naurp -X /home/rddunlap/doc/dontdiff-osdl linux-262-rc3/init/initramfs.c linux-262-rc3-syscalls/init/initramfs.c
1991--- linux-262-rc3/init/initramfs.c 2004-01-08 22:59:07.000000000 -0800
1992+++ linux-262-rc3-syscalls/init/initramfs.c 2004-02-02 10:13:13.000000000 -0800
1993@@ -7,6 +7,7 @@
1994 #include <linux/unistd.h>
1995 #include <linux/delay.h>
1996 #include <linux/string.h>
1997+#include <linux/syscalls.h>
1998
1999 static __initdata char *message;
2000 static void __init error(char *x)
2001@@ -25,17 +26,6 @@ static void __init free(void *where)
2002 kfree(where);
2003 }
2004
2005-asmlinkage long sys_mkdir(char *name, int mode);
2006-asmlinkage long sys_mknod(char *name, int mode, unsigned dev);
2007-asmlinkage long sys_symlink(char *old, char *new);
2008-asmlinkage long sys_link(char *old, char *new);
2009-asmlinkage long sys_write(int fd, const char *buf, size_t size);
2010-asmlinkage long sys_chown(char *name, uid_t uid, gid_t gid);
2011-asmlinkage long sys_lchown(char *name, uid_t uid, gid_t gid);
2012-asmlinkage long sys_fchown(int fd, uid_t uid, gid_t gid);
2013-asmlinkage long sys_chmod(char *name, mode_t mode);
2014-asmlinkage long sys_fchmod(int fd, mode_t mode);
2015-
2016 /* link hash */
2017
2018 static struct hash {
2019diff -Naurp -X /home/rddunlap/doc/dontdiff-osdl linux-262-rc3/kernel/compat.c linux-262-rc3-syscalls/kernel/compat.c
2020--- linux-262-rc3/kernel/compat.c 2004-01-08 22:59:34.000000000 -0800
2021+++ linux-262-rc3-syscalls/kernel/compat.c 2004-02-02 10:13:13.000000000 -0800
2022@@ -18,6 +18,7 @@
2023 #include <linux/signal.h>
2024 #include <linux/sched.h> /* for MAX_SCHEDULE_TIMEOUT */
2025 #include <linux/futex.h> /* for FUTEX_WAIT */
2026+#include <linux/syscalls.h>
2027 #include <linux/unistd.h>
2028
2029 #include <asm/uaccess.h>
2030@@ -172,8 +173,6 @@ asmlinkage long compat_sys_times(struct
2031 * types that can be passed to put_user()/get_user().
2032 */
2033
2034-extern asmlinkage long sys_sigpending(old_sigset_t *);
2035-
2036 asmlinkage long compat_sys_sigpending(compat_old_sigset_t *set)
2037 {
2038 old_sigset_t s;
2039@@ -188,8 +187,6 @@ asmlinkage long compat_sys_sigpending(co
2040 return ret;
2041 }
2042
2043-extern asmlinkage long sys_sigprocmask(int, old_sigset_t *, old_sigset_t *);
2044-
2045 asmlinkage long compat_sys_sigprocmask(int how, compat_old_sigset_t *set,
2046 compat_old_sigset_t *oset)
2047 {
2048@@ -381,9 +378,6 @@ compat_sys_wait4(compat_pid_t pid, compa
2049 }
2050 }
2051
2052-extern asmlinkage long sys_sched_setaffinity(pid_t pid, unsigned int len,
2053- unsigned long *user_mask_ptr);
2054-
2055 asmlinkage long compat_sys_sched_setaffinity(compat_pid_t pid,
2056 unsigned int len,
2057 compat_ulong_t *user_mask_ptr)
2058@@ -405,9 +399,6 @@ asmlinkage long compat_sys_sched_setaffi
2059 return ret;
2060 }
2061
2062-extern asmlinkage long sys_sched_getaffinity(pid_t pid, unsigned int len,
2063- unsigned long *user_mask_ptr);
2064-
2065 asmlinkage int compat_sys_sched_getaffinity(compat_pid_t pid, unsigned int len,
2066 compat_ulong_t *user_mask_ptr)
2067 {
2068@@ -449,12 +440,6 @@ static int put_compat_itimerspec(struct
2069 return 0;
2070 }
2071
2072-extern asmlinkage long sys_timer_settime(timer_t timer_id, int flags,
2073- struct itimerspec __user *new_setting,
2074- struct itimerspec __user *old_setting);
2075-extern asmlinkage long sys_timer_gettime(timer_t timer_id,
2076- struct itimerspec __user *setting);
2077-
2078 long compat_timer_settime(timer_t timer_id, int flags,
2079 struct compat_itimerspec *new,
2080 struct compat_itimerspec *old)
2081@@ -487,9 +472,6 @@ long compat_timer_gettime(timer_t timer_
2082 return err;
2083 }
2084
2085-extern asmlinkage long
2086-sys_clock_settime(clockid_t which_clock, struct timespec __user *tp);
2087-
2088 long compat_clock_settime(clockid_t which_clock, struct compat_timespec *tp)
2089 {
2090 long err;
2091@@ -504,9 +486,6 @@ long compat_clock_settime(clockid_t whic
2092 return err;
2093 }
2094
2095-extern asmlinkage long
2096-sys_clock_gettime(clockid_t which_clock, struct timespec __user *tp);
2097-
2098 long compat_clock_gettime(clockid_t which_clock, struct compat_timespec *tp)
2099 {
2100 long err;
2101@@ -521,9 +500,6 @@ long compat_clock_gettime(clockid_t whic
2102 return err;
2103 }
2104
2105-extern asmlinkage long
2106-sys_clock_getres(clockid_t which_clock, struct timespec __user *tp);
2107-
2108 long compat_clock_getres(clockid_t which_clock, struct compat_timespec *tp)
2109 {
2110 long err;
2111@@ -538,11 +514,6 @@ long compat_clock_getres(clockid_t which
2112 return err;
2113 }
2114
2115-extern asmlinkage long
2116-sys_clock_nanosleep(clockid_t which_clock, int flags,
2117- struct timespec __user *rqtp,
2118- struct timespec __user *rmtp);
2119-
2120 long compat_clock_nanosleep(clockid_t which_clock, int flags,
2121 struct compat_timespec __user *rqtp,
2122 struct compat_timespec __user *rmtp)
2123diff -Naurp -X /home/rddunlap/doc/dontdiff-osdl linux-262-rc3/kernel/panic.c linux-262-rc3-syscalls/kernel/panic.c
2124--- linux-262-rc3/kernel/panic.c 2004-01-08 23:00:03.000000000 -0800
2125+++ linux-262-rc3-syscalls/kernel/panic.c 2004-02-02 15:49:22.000000000 -0800
2126@@ -16,11 +16,10 @@
2127 #include <linux/notifier.h>
2128 #include <linux/init.h>
2129 #include <linux/sysrq.h>
2130+#include <linux/syscalls.h>
2131 #include <linux/interrupt.h>
2132 #include <linux/nmi.h>
2133
2134-asmlinkage void sys_sync(void); /* it's really int */
2135-
2136 int panic_timeout;
2137 int panic_on_oops;
2138 int tainted;
2139diff -Naurp -X /home/rddunlap/doc/dontdiff-osdl linux-262-rc3/kernel/power/disk.c linux-262-rc3-syscalls/kernel/power/disk.c
2140--- linux-262-rc3/kernel/power/disk.c 2004-01-08 22:59:06.000000000 -0800
2141+++ linux-262-rc3-syscalls/kernel/power/disk.c 2004-02-02 10:13:13.000000000 -0800
2142@@ -12,6 +12,7 @@
2143
2144
2145 #include <linux/suspend.h>
2146+#include <linux/syscalls.h>
2147 #include <linux/reboot.h>
2148 #include <linux/string.h>
2149 #include <linux/delay.h>
2150@@ -28,8 +29,6 @@ extern int pmdisk_read(void);
2151 extern int pmdisk_restore(void);
2152 extern int pmdisk_free(void);
2153
2154-extern long sys_sync(void);
2155-
2156
2157 /**
2158 * power_down - Shut machine down for hibernate.
2159diff -Naurp -X /home/rddunlap/doc/dontdiff-osdl linux-262-rc3/kernel/power/swsusp.c linux-262-rc3-syscalls/kernel/power/swsusp.c
2160--- linux-262-rc3/kernel/power/swsusp.c 2004-01-08 22:59:19.000000000 -0800
2161+++ linux-262-rc3-syscalls/kernel/power/swsusp.c 2004-02-02 10:13:13.000000000 -0800
2162@@ -59,6 +59,7 @@
2163 #include <linux/buffer_head.h>
2164 #include <linux/swapops.h>
2165 #include <linux/bootmem.h>
2166+#include <linux/syscalls.h>
2167
2168 #include <asm/uaccess.h>
2169 #include <asm/mmu_context.h>
2170@@ -67,8 +68,6 @@
2171
2172 #include "power.h"
2173
2174-extern long sys_sync(void);
2175-
2176 unsigned char software_suspend_enabled = 0;
2177
2178 extern void do_magic(int resume);
2179diff -Naurp -X /home/rddunlap/doc/dontdiff-osdl linux-262-rc3/kernel/sysctl.c linux-262-rc3-syscalls/kernel/sysctl.c
2180--- linux-262-rc3/kernel/sysctl.c 2004-02-02 09:54:24.000000000 -0800
2181+++ linux-262-rc3-syscalls/kernel/sysctl.c 2004-02-02 10:13:13.000000000 -0800
2182@@ -2015,7 +2015,7 @@ int sysctl_jiffies(ctl_table *table, int
2183 #else /* CONFIG_SYSCTL */
2184
2185
2186-extern asmlinkage long sys_sysctl(struct __sysctl_args __user *args)
2187+asmlinkage long sys_sysctl(struct __sysctl_args __user *args)
2188 {
2189 return -ENOSYS;
2190 }
2191diff -Naurp -X /home/rddunlap/doc/dontdiff-osdl linux-262-rc3/kernel/uid16.c linux-262-rc3-syscalls/kernel/uid16.c
2192--- linux-262-rc3/kernel/uid16.c 2004-01-08 22:59:43.000000000 -0800
2193+++ linux-262-rc3-syscalls/kernel/uid16.c 2004-02-02 10:13:13.000000000 -0800
2194@@ -13,21 +13,10 @@
2195 #include <linux/init.h>
2196 #include <linux/highuid.h>
2197 #include <linux/security.h>
2198+#include <linux/syscalls.h>
2199
2200 #include <asm/uaccess.h>
2201
2202-extern asmlinkage long sys_chown(const char *, uid_t,gid_t);
2203-extern asmlinkage long sys_lchown(const char *, uid_t,gid_t);
2204-extern asmlinkage long sys_fchown(unsigned int, uid_t,gid_t);
2205-extern asmlinkage long sys_setregid(gid_t, gid_t);
2206-extern asmlinkage long sys_setgid(gid_t);
2207-extern asmlinkage long sys_setreuid(uid_t, uid_t);
2208-extern asmlinkage long sys_setuid(uid_t);
2209-extern asmlinkage long sys_setresuid(uid_t, uid_t, uid_t);
2210-extern asmlinkage long sys_setresgid(gid_t, gid_t, gid_t);
2211-extern asmlinkage long sys_setfsuid(uid_t);
2212-extern asmlinkage long sys_setfsgid(gid_t);
2213-
2214 asmlinkage long sys_chown16(const char * filename, old_uid_t user, old_gid_t group)
2215 {
2216 return sys_chown(filename, low2highuid(user), low2highgid(group));
2217diff -Naurp -X /home/rddunlap/doc/dontdiff-osdl linux-262-rc3/net/compat.c linux-262-rc3-syscalls/net/compat.c
2218--- linux-262-rc3/net/compat.c 2004-01-08 22:59:44.000000000 -0800
2219+++ linux-262-rc3-syscalls/net/compat.c 2004-02-02 10:13:13.000000000 -0800
2220@@ -18,6 +18,7 @@
2221 #include <linux/file.h>
2222 #include <linux/icmpv6.h>
2223 #include <linux/socket.h>
2224+#include <linux/syscalls.h>
2225 #include <linux/filter.h>
2226 #include <linux/compat.h>
2227 #include <linux/netfilter_ipv4/ip_tables.h>
2228@@ -304,9 +305,6 @@ void scm_detach_fds_compat(struct msghdr
2229 __scm_destroy(scm);
2230 }
2231
2232-extern asmlinkage long sys_setsockopt(int fd, int level, int optname,
2233- char *optval, int optlen);
2234-
2235 /*
2236 * For now, we assume that the compatibility and native version
2237 * of struct ipt_entry are the same - sfr. FIXME
2238@@ -471,9 +469,6 @@ asmlinkage long compat_sys_setsockopt(in
2239 return sys_setsockopt(fd, level, optname, optval, optlen);
2240 }
2241
2242-extern asmlinkage long sys_getsockopt(int fd, int level, int optname,
2243- void * optval, int *optlen);
2244-
2245 static int do_get_sock_timeout(int fd, int level, int optname, char *optval,
2246 int *optlen)
2247 {
2248@@ -517,22 +512,6 @@ static unsigned char nas[18]={AL(0),AL(3
2249 AL(6),AL(2),AL(5),AL(5),AL(3),AL(3)};
2250 #undef AL
2251
2252-extern asmlinkage long sys_bind(int, struct sockaddr *, int);
2253-extern asmlinkage long sys_connect(int, struct sockaddr *, int);
2254-extern asmlinkage long sys_accept(int, struct sockaddr *, int *);
2255-extern asmlinkage long sys_getsockname(int, struct sockaddr *, int *);
2256-extern asmlinkage long sys_getpeername(int, struct sockaddr *, int *);
2257-extern asmlinkage long sys_send(int, void *, size_t, unsigned);
2258-extern asmlinkage long sys_sendto(int, void *, size_t, unsigned,
2259- struct sockaddr *, int);
2260-extern asmlinkage long sys_recv(int, void *, size_t, unsigned);
2261-extern asmlinkage long sys_recvfrom(int, void *, size_t, unsigned,
2262- struct sockaddr *, int *);
2263-extern asmlinkage long sys_socket(int, int, int);
2264-extern asmlinkage long sys_socketpair(int, int, int, int [2]);
2265-extern asmlinkage long sys_shutdown(int, int);
2266-extern asmlinkage long sys_listen(int, int);
2267-
2268 asmlinkage long compat_sys_sendmsg(int fd, struct compat_msghdr *msg, unsigned flags)
2269 {
2270 return sys_sendmsg(fd, (struct msghdr *)msg, flags | MSG_CMSG_COMPAT);
The Linux kernel (the core of the Linux operating system)
This page took 0.471421 seconds and 4 git commands to generate.