diff options
Diffstat (limited to 'sys/i386')
-rw-r--r-- | sys/i386/i386/in_cksum.c | 6 | ||||
-rw-r--r-- | sys/i386/i386/k6_mem.c | 2 | ||||
-rw-r--r-- | sys/i386/i386/sys_machdep.c | 4 | ||||
-rw-r--r-- | sys/i386/i386/vm_machdep.c | 2 | ||||
-rw-r--r-- | sys/i386/ibcs2/ibcs2_misc.c | 160 | ||||
-rw-r--r-- | sys/i386/ibcs2/ibcs2_other.c | 2 | ||||
-rw-r--r-- | sys/i386/ibcs2/ibcs2_signal.c | 28 | ||||
-rw-r--r-- | sys/i386/ibcs2/ibcs2_socksys.c | 12 | ||||
-rw-r--r-- | sys/i386/isa/ccbque.h | 6 | ||||
-rw-r--r-- | sys/i386/isa/elink.c | 4 |
10 files changed, 67 insertions, 159 deletions
diff --git a/sys/i386/i386/in_cksum.c b/sys/i386/i386/in_cksum.c index 32fdf7ebf983..99fa4448b778 100644 --- a/sys/i386/i386/in_cksum.c +++ b/sys/i386/i386/in_cksum.c @@ -263,9 +263,9 @@ in_cksum_skip(m, len, skip) int len; int skip; { - register u_short *w; - register unsigned sum = 0; - register int mlen = 0; + u_short *w; + unsigned sum = 0; + int mlen = 0; int byte_swapped = 0; union { char c[2]; u_short s; } su; diff --git a/sys/i386/i386/k6_mem.c b/sys/i386/i386/k6_mem.c index c99cf277489a..091b189a3ea5 100644 --- a/sys/i386/i386/k6_mem.c +++ b/sys/i386/i386/k6_mem.c @@ -78,7 +78,7 @@ static __inline int k6_mrmake(struct mem_range_desc *desc, u_int32_t *mtrr) { u_int32_t len = 0, wc, uc; - register int bit; + int bit; if (desc->mr_base &~ 0xfffe0000) return (EINVAL); diff --git a/sys/i386/i386/sys_machdep.c b/sys/i386/i386/sys_machdep.c index bbf631781d1d..3afed49c7b3b 100644 --- a/sys/i386/i386/sys_machdep.c +++ b/sys/i386/i386/sys_machdep.c @@ -98,9 +98,7 @@ struct sysarch_args { #endif int -sysarch(td, uap) - struct thread *td; - register struct sysarch_args *uap; +sysarch(struct thread *td, struct sysarch_args *uap) { int error; union descriptor *lp; diff --git a/sys/i386/i386/vm_machdep.c b/sys/i386/i386/vm_machdep.c index 1896bbd5bf11..a0a9473b3bdf 100644 --- a/sys/i386/i386/vm_machdep.c +++ b/sys/i386/i386/vm_machdep.c @@ -166,7 +166,7 @@ alloc_fpusave(int flags) void cpu_fork(struct thread *td1, struct proc *p2, struct thread *td2, int flags) { - register struct proc *p1; + struct proc *p1; struct pcb *pcb2; struct mdproc *mdp2; diff --git a/sys/i386/ibcs2/ibcs2_misc.c b/sys/i386/ibcs2/ibcs2_misc.c index ccf5190b0a71..6e1b43ffdf27 100644 --- a/sys/i386/ibcs2/ibcs2_misc.c +++ b/sys/i386/ibcs2/ibcs2_misc.c @@ -93,9 +93,7 @@ __FBSDID("$FreeBSD$"); #include <security/mac/mac_framework.h> int -ibcs2_ulimit(td, uap) - struct thread *td; - struct ibcs2_ulimit_args *uap; +ibcs2_ulimit(struct thread *td, struct ibcs2_ulimit_args *uap) { struct rlimit rl; int error; @@ -134,9 +132,7 @@ ibcs2_ulimit(td, uap) #define IBCS2_WSTOPPED 0177 #define IBCS2_STOPCODE(sig) ((sig) << 8 | IBCS2_WSTOPPED) int -ibcs2_wait(td, uap) - struct thread *td; - struct ibcs2_wait_args *uap; +ibcs2_wait(struct thread *td, struct ibcs2_wait_args *uap) { int error, options, status; int *statusp; @@ -185,9 +181,7 @@ ibcs2_wait(td, uap) } int -ibcs2_execv(td, uap) - struct thread *td; - struct ibcs2_execv_args *uap; +ibcs2_execv(struct thread *td, struct ibcs2_execv_args *uap) { struct image_args eargs; struct vmspace *oldvmspace; @@ -210,9 +204,7 @@ ibcs2_execv(td, uap) } int -ibcs2_execve(td, uap) - struct thread *td; - struct ibcs2_execve_args *uap; +ibcs2_execve(struct thread *td, struct ibcs2_execve_args *uap) { struct image_args eargs; struct vmspace *oldvmspace; @@ -236,9 +228,7 @@ ibcs2_execve(td, uap) } int -ibcs2_umount(td, uap) - struct thread *td; - struct ibcs2_umount_args *uap; +ibcs2_umount(struct thread *td, struct ibcs2_umount_args *uap) { struct unmount_args um; @@ -248,9 +238,7 @@ ibcs2_umount(td, uap) } int -ibcs2_mount(td, uap) - struct thread *td; - struct ibcs2_mount_args *uap; +ibcs2_mount(struct thread *td, struct ibcs2_mount_args *uap) { #ifdef notyet int oflags = uap->flags, nflags, error; @@ -321,15 +309,13 @@ ibcs2_mount(td, uap) */ int -ibcs2_getdents(td, uap) - struct thread *td; - register struct ibcs2_getdents_args *uap; +ibcs2_getdents(struct thread *td, struct ibcs2_getdents_args *uap) { - register struct vnode *vp; - register caddr_t inp, buf; /* BSD-format */ - register int len, reclen; /* BSD-format */ - register caddr_t outp; /* iBCS2-format */ - register int resid; /* iBCS2-format */ + struct vnode *vp; + caddr_t inp, buf; /* BSD-format */ + int len, reclen; /* BSD-format */ + caddr_t outp; /* iBCS2-format */ + int resid; /* iBCS2-format */ cap_rights_t rights; struct file *fp; struct uio auio; @@ -475,15 +461,13 @@ out: } int -ibcs2_read(td, uap) - struct thread *td; - struct ibcs2_read_args *uap; +ibcs2_read(struct thread *td, struct ibcs2_read_args *uap) { - register struct vnode *vp; - register caddr_t inp, buf; /* BSD-format */ - register int len, reclen; /* BSD-format */ - register caddr_t outp; /* iBCS2-format */ - register int resid; /* iBCS2-format */ + struct vnode *vp; + caddr_t inp, buf; /* BSD-format */ + int len, reclen; /* BSD-format */ + caddr_t outp; /* iBCS2-format */ + int resid; /* iBCS2-format */ cap_rights_t rights; struct file *fp; struct uio auio; @@ -640,9 +624,7 @@ out: } int -ibcs2_mknod(td, uap) - struct thread *td; - struct ibcs2_mknod_args *uap; +ibcs2_mknod(struct thread *td, struct ibcs2_mknod_args *uap) { char *path; int error; @@ -660,9 +642,7 @@ ibcs2_mknod(td, uap) } int -ibcs2_getgroups(td, uap) - struct thread *td; - struct ibcs2_getgroups_args *uap; +ibcs2_getgroups(struct thread *td, struct ibcs2_getgroups_args *uap) { struct ucred *cred; ibcs2_gid_t *iset; @@ -690,9 +670,7 @@ out: } int -ibcs2_setgroups(td, uap) - struct thread *td; - struct ibcs2_setgroups_args *uap; +ibcs2_setgroups(struct thread *td, struct ibcs2_setgroups_args *uap) { ibcs2_gid_t *iset; gid_t *gp; @@ -722,9 +700,7 @@ out: } int -ibcs2_setuid(td, uap) - struct thread *td; - struct ibcs2_setuid_args *uap; +ibcs2_setuid(struct thread *td, struct ibcs2_setuid_args *uap) { struct setuid_args sa; @@ -733,9 +709,7 @@ ibcs2_setuid(td, uap) } int -ibcs2_setgid(td, uap) - struct thread *td; - struct ibcs2_setgid_args *uap; +ibcs2_setgid(struct thread *td, struct ibcs2_setgid_args *uap) { struct setgid_args sa; @@ -744,9 +718,7 @@ ibcs2_setgid(td, uap) } int -ibcs2_time(td, uap) - struct thread *td; - struct ibcs2_time_args *uap; +ibcs2_time(struct thread *td, struct ibcs2_time_args *uap) { struct timeval tv; @@ -760,9 +732,7 @@ ibcs2_time(td, uap) } int -ibcs2_pathconf(td, uap) - struct thread *td; - struct ibcs2_pathconf_args *uap; +ibcs2_pathconf(struct thread *td, struct ibcs2_pathconf_args *uap) { char *path; int error; @@ -775,18 +745,14 @@ ibcs2_pathconf(td, uap) } int -ibcs2_fpathconf(td, uap) - struct thread *td; - struct ibcs2_fpathconf_args *uap; +ibcs2_fpathconf(struct thread *td, struct ibcs2_fpathconf_args *uap) { uap->name++; /* iBCS2 _PC_* defines are offset by one */ return sys_fpathconf(td, (struct fpathconf_args *)uap); } int -ibcs2_sysconf(td, uap) - struct thread *td; - struct ibcs2_sysconf_args *uap; +ibcs2_sysconf(struct thread *td, struct ibcs2_sysconf_args *uap) { int mib[2], value, len, error; @@ -845,9 +811,7 @@ ibcs2_sysconf(td, uap) } int -ibcs2_alarm(td, uap) - struct thread *td; - struct ibcs2_alarm_args *uap; +ibcs2_alarm(struct thread *td, struct ibcs2_alarm_args *uap) { struct itimerval itv, oitv; int error; @@ -865,9 +829,7 @@ ibcs2_alarm(td, uap) } int -ibcs2_times(td, uap) - struct thread *td; - struct ibcs2_times_args *uap; +ibcs2_times(struct thread *td, struct ibcs2_times_args *uap) { struct rusage ru; struct timeval t; @@ -895,9 +857,7 @@ ibcs2_times(td, uap) } int -ibcs2_stime(td, uap) - struct thread *td; - struct ibcs2_stime_args *uap; +ibcs2_stime(struct thread *td, struct ibcs2_stime_args *uap) { struct timeval tv; long secs; @@ -915,9 +875,7 @@ ibcs2_stime(td, uap) } int -ibcs2_utime(td, uap) - struct thread *td; - struct ibcs2_utime_args *uap; +ibcs2_utime(struct thread *td, struct ibcs2_utime_args *uap) { struct ibcs2_utimbuf ubuf; struct timeval tbuf[2], *tp; @@ -944,9 +902,7 @@ ibcs2_utime(td, uap) } int -ibcs2_nice(td, uap) - struct thread *td; - struct ibcs2_nice_args *uap; +ibcs2_nice(struct thread *td, struct ibcs2_nice_args *uap) { int error; struct setpriority_args sa; @@ -965,9 +921,7 @@ ibcs2_nice(td, uap) */ int -ibcs2_pgrpsys(td, uap) - struct thread *td; - struct ibcs2_pgrpsys_args *uap; +ibcs2_pgrpsys(struct thread *td, struct ibcs2_pgrpsys_args *uap) { struct proc *p = td->td_proc; switch (uap->type) { @@ -1012,9 +966,7 @@ ibcs2_pgrpsys(td, uap) */ int -ibcs2_plock(td, uap) - struct thread *td; - struct ibcs2_plock_args *uap; +ibcs2_plock(struct thread *td, struct ibcs2_plock_args *uap) { int error; #define IBCS2_UNLOCK 0 @@ -1044,9 +996,7 @@ ibcs2_plock(td, uap) } int -ibcs2_uadmin(td, uap) - struct thread *td; - struct ibcs2_uadmin_args *uap; +ibcs2_uadmin(struct thread *td, struct ibcs2_uadmin_args *uap) { #define SCO_A_REBOOT 1 #define SCO_A_SHUTDOWN 2 @@ -1093,9 +1043,7 @@ ibcs2_uadmin(td, uap) } int -ibcs2_sysfs(td, uap) - struct thread *td; - struct ibcs2_sysfs_args *uap; +ibcs2_sysfs(struct thread *td, struct ibcs2_sysfs_args *uap) { #define IBCS2_GETFSIND 1 #define IBCS2_GETFSTYP 2 @@ -1111,9 +1059,7 @@ ibcs2_sysfs(td, uap) } int -ibcs2_unlink(td, uap) - struct thread *td; - struct ibcs2_unlink_args *uap; +ibcs2_unlink(struct thread *td, struct ibcs2_unlink_args *uap) { char *path; int error; @@ -1125,9 +1071,7 @@ ibcs2_unlink(td, uap) } int -ibcs2_chdir(td, uap) - struct thread *td; - struct ibcs2_chdir_args *uap; +ibcs2_chdir(struct thread *td, struct ibcs2_chdir_args *uap) { char *path; int error; @@ -1139,9 +1083,7 @@ ibcs2_chdir(td, uap) } int -ibcs2_chmod(td, uap) - struct thread *td; - struct ibcs2_chmod_args *uap; +ibcs2_chmod(struct thread *td, struct ibcs2_chmod_args *uap) { char *path; int error; @@ -1153,9 +1095,7 @@ ibcs2_chmod(td, uap) } int -ibcs2_chown(td, uap) - struct thread *td; - struct ibcs2_chown_args *uap; +ibcs2_chown(struct thread *td, struct ibcs2_chown_args *uap) { char *path; int error; @@ -1168,9 +1108,7 @@ ibcs2_chown(td, uap) } int -ibcs2_rmdir(td, uap) - struct thread *td; - struct ibcs2_rmdir_args *uap; +ibcs2_rmdir(struct thread *td, struct ibcs2_rmdir_args *uap) { char *path; int error; @@ -1182,9 +1120,7 @@ ibcs2_rmdir(td, uap) } int -ibcs2_mkdir(td, uap) - struct thread *td; - struct ibcs2_mkdir_args *uap; +ibcs2_mkdir(struct thread *td, struct ibcs2_mkdir_args *uap) { char *path; int error; @@ -1196,9 +1132,7 @@ ibcs2_mkdir(td, uap) } int -ibcs2_symlink(td, uap) - struct thread *td; - struct ibcs2_symlink_args *uap; +ibcs2_symlink(struct thread *td, struct ibcs2_symlink_args *uap) { char *path, *link; int error; @@ -1221,9 +1155,7 @@ ibcs2_symlink(td, uap) } int -ibcs2_rename(td, uap) - struct thread *td; - struct ibcs2_rename_args *uap; +ibcs2_rename(struct thread *td, struct ibcs2_rename_args *uap) { char *from, *to; int error; @@ -1246,9 +1178,7 @@ ibcs2_rename(td, uap) } int -ibcs2_readlink(td, uap) - struct thread *td; - struct ibcs2_readlink_args *uap; +ibcs2_readlink(struct thread *td, struct ibcs2_readlink_args *uap) { char *path; int error; diff --git a/sys/i386/ibcs2/ibcs2_other.c b/sys/i386/ibcs2/ibcs2_other.c index b49e605eb232..80f3c5ac17ef 100644 --- a/sys/i386/ibcs2/ibcs2_other.c +++ b/sys/i386/ibcs2/ibcs2_other.c @@ -68,7 +68,7 @@ ibcs2_secure(struct thread *td, struct ibcs2_secure_args *uap) } int -ibcs2_lseek(struct thread *td, register struct ibcs2_lseek_args *uap) +ibcs2_lseek(struct thread *td, struct ibcs2_lseek_args *uap) { struct lseek_args largs; int error; diff --git a/sys/i386/ibcs2/ibcs2_signal.c b/sys/i386/ibcs2/ibcs2_signal.c index 6776df19e29e..4c17aa9bc977 100644 --- a/sys/i386/ibcs2/ibcs2_signal.c +++ b/sys/i386/ibcs2/ibcs2_signal.c @@ -190,9 +190,7 @@ bsd_to_ibcs2_sigaction(bsa, isa) } int -ibcs2_sigaction(td, uap) - register struct thread *td; - struct ibcs2_sigaction_args *uap; +ibcs2_sigaction(struct thread *td, struct ibcs2_sigaction_args *uap) { struct ibcs2_sigaction isa; struct sigaction nbsa, obsa; @@ -218,9 +216,7 @@ ibcs2_sigaction(td, uap) } int -ibcs2_sigsys(td, uap) - register struct thread *td; - struct ibcs2_sigsys_args *uap; +ibcs2_sigsys(struct thread *td, struct ibcs2_sigsys_args *uap) { struct proc *p = td->td_proc; struct sigaction sa; @@ -341,9 +337,7 @@ ibcs2_sigsys(td, uap) } int -ibcs2_sigprocmask(td, uap) - register struct thread *td; - struct ibcs2_sigprocmask_args *uap; +ibcs2_sigprocmask(struct thread *td, struct ibcs2_sigprocmask_args *uap) { ibcs2_sigset_t iss; sigset_t oss, nss; @@ -379,9 +373,7 @@ ibcs2_sigprocmask(td, uap) } int -ibcs2_sigpending(td, uap) - register struct thread *td; - struct ibcs2_sigpending_args *uap; +ibcs2_sigpending(struct thread *td, struct ibcs2_sigpending_args *uap) { struct proc *p = td->td_proc; sigset_t bss; @@ -398,9 +390,7 @@ ibcs2_sigpending(td, uap) } int -ibcs2_sigsuspend(td, uap) - register struct thread *td; - struct ibcs2_sigsuspend_args *uap; +ibcs2_sigsuspend(struct thread *td, struct ibcs2_sigsuspend_args *uap) { ibcs2_sigset_t sss; sigset_t bss; @@ -414,9 +404,7 @@ ibcs2_sigsuspend(td, uap) } int -ibcs2_pause(td, uap) - register struct thread *td; - struct ibcs2_pause_args *uap; +ibcs2_pause(struct thread *td, struct ibcs2_pause_args *uap) { sigset_t mask; @@ -427,9 +415,7 @@ ibcs2_pause(td, uap) } int -ibcs2_kill(td, uap) - register struct thread *td; - struct ibcs2_kill_args *uap; +ibcs2_kill(struct thread *td, struct ibcs2_kill_args *uap) { struct kill_args ka; diff --git a/sys/i386/ibcs2/ibcs2_socksys.c b/sys/i386/ibcs2/ibcs2_socksys.c index 80b121614b8c..3b5a7e53551d 100644 --- a/sys/i386/ibcs2/ibcs2_socksys.c +++ b/sys/i386/ibcs2/ibcs2_socksys.c @@ -58,9 +58,7 @@ static int ibcs2_setipdomainname(struct thread *, */ int -ibcs2_socksys(td, uap) - register struct thread *td; - register struct ibcs2_socksys_args *uap; +ibcs2_socksys(struct thread *td, struct ibcs2_socksys_args *uap) { int error; int realargs[7]; /* 1 for command, 6 for recvfrom */ @@ -142,9 +140,7 @@ ibcs2_socksys(td, uap) /* ARGSUSED */ static int -ibcs2_getipdomainname(td, uap) - struct thread *td; - struct getipdomainname_args *uap; +ibcs2_getipdomainname(struct thread *td, struct getipdomainname_args *uap) { char hname[MAXHOSTNAMELEN], *dptr; int len; @@ -167,9 +163,7 @@ ibcs2_getipdomainname(td, uap) /* ARGSUSED */ static int -ibcs2_setipdomainname(td, uap) - struct thread *td; - struct setipdomainname_args *uap; +ibcs2_setipdomainname(struct thread *td, struct setipdomainname_args *uap) { char hname[MAXHOSTNAMELEN], *ptr; int error, sctl[2], hlen; diff --git a/sys/i386/isa/ccbque.h b/sys/i386/isa/ccbque.h index 72375b087db1..5a053f12c94e 100644 --- a/sys/i386/isa/ccbque.h +++ b/sys/i386/isa/ccbque.h @@ -51,7 +51,7 @@ struct CCBTYPE##que { \ \ void DEV##_init_ccbque(int); \ struct CCBTYPE *DEV##_get_ccb(void); \ -void DEV##_free_ccb(register struct CCBTYPE *); +void DEV##_free_ccb(struct CCBTYPE *); /* (II) static allocated memory */ #define GENERIC_CCB_STATIC_ALLOC(DEV, CCBTYPE) \ @@ -72,7 +72,7 @@ DEV##_init_ccbque(count) \ struct CCBTYPE * \ DEV##_get_ccb() \ { \ - register struct CCBTYPE *cb; \ + struct CCBTYPE *cb; \ int s = splcam(); \ \ if (CCBTYPE##que.count < CCBTYPE##que.maxccb) \ @@ -105,7 +105,7 @@ out: \ \ void \ DEV##_free_ccb(cb) \ - register struct CCBTYPE *cb; \ + struct CCBTYPE *cb; \ { \ int s = splcam(); \ \ diff --git a/sys/i386/isa/elink.c b/sys/i386/isa/elink.c index 5fbfd363192b..e3e4755dee99 100644 --- a/sys/i386/isa/elink.c +++ b/sys/i386/isa/elink.c @@ -70,8 +70,8 @@ elink_reset() void elink_idseq(u_char p) { - register int i; - register u_char c; + int i; + u_char c; c = 0xff; for (i = 255; i; i--) { |