Port-alpha archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
patch for christos_time_t merge
hi folks,
someone is probably already done fixing this but in case that's
not the case i've hacked up this patch to get alpha building again
after the time_t merge.
if someone doesn't mind giving it a review since i'm not an alpha
person that would be helpful.
please cc me directly i'm not subscribed.
thanks
tyler
Index: sys/compat/linux/arch/alpha/linux_syscall.h
===================================================================
RCS file: /cvsroot/src/sys/compat/linux/arch/alpha/linux_syscall.h,v
retrieving revision 1.69
diff -u -p -u -p -r1.69 linux_syscall.h
--- sys/compat/linux/arch/alpha/linux_syscall.h 19 Nov 2008 18:39:43 -0000
1.69
+++ sys/compat/linux/arch/alpha/linux_syscall.h 13 Jan 2009 11:20:16 -0000
@@ -486,22 +486,22 @@
/* syscall: "select" ret: "int" args: "int" "fd_set *" "fd_set *" "fd_set *"
"struct timeval *" */
#define LINUX_SYS_select 358
-/* syscall: "gettimeofday" ret: "int" args: "struct timeval *" "struct
timezone *" */
+/* syscall: "gettimeofday" ret: "int" args: "struct timeval50 *" "struct
timezone *" */
#define LINUX_SYS_gettimeofday 359
-/* syscall: "settimeofday" ret: "int" args: "const struct timeval *" "const
struct timezone *" */
+/* syscall: "settimeofday" ret: "int" args: "const struct timeval50 *" "const
struct timezone *" */
#define LINUX_SYS_settimeofday 360
-/* syscall: "getitimer" ret: "int" args: "int" "struct itimerval *" */
+/* syscall: "getitimer" ret: "int" args: "int" "struct itimerval50 *" */
#define LINUX_SYS_getitimer 361
-/* syscall: "setitimer" ret: "int" args: "int" "const struct itimerval *"
"struct itimerval *" */
+/* syscall: "setitimer" ret: "int" args: "int" "const struct itimerval50 *"
"struct itimerval50 *" */
#define LINUX_SYS_setitimer 362
-/* syscall: "utimes" ret: "int" args: "char *" "struct timeval *" */
+/* syscall: "utimes" ret: "int" args: "char *" "struct timeval50 *" */
#define LINUX_SYS_utimes 363
-/* syscall: "getrusage" ret: "int" args: "int" "struct rusage *" */
+/* syscall: "getrusage" ret: "int" args: "int" "struct rusage50 *" */
#define LINUX_SYS_getrusage 364
/* syscall: "wait4" ret: "int" args: "int" "int *" "int" "struct rusage *" */
Index: sys/compat/linux/arch/alpha/linux_syscallargs.h
===================================================================
RCS file: /cvsroot/src/sys/compat/linux/arch/alpha/linux_syscallargs.h,v
retrieving revision 1.68
diff -u -p -u -p -r1.68 linux_syscallargs.h
--- sys/compat/linux/arch/alpha/linux_syscallargs.h 19 Nov 2008 18:39:43
-0000 1.68
+++ sys/compat/linux/arch/alpha/linux_syscallargs.h 13 Jan 2009 11:20:17
-0000
@@ -763,17 +763,17 @@ struct linux_sys_select_args {
};
check_syscall_args(linux_sys_select)
-struct sys_gettimeofday_args;
+struct compat_50_sys_gettimeofday_args;
-struct sys_settimeofday_args;
+struct compat_50_sys_settimeofday_args;
-struct sys_getitimer_args;
+struct compat_50_sys_getitimer_args;
-struct sys_setitimer_args;
+struct compat_50_sys_setitimer_args;
-struct sys_utimes_args;
+struct compat_50_sys_utimes_args;
-struct sys_getrusage_args;
+struct compat_50_sys_getrusage_args;
struct linux_sys_wait4_args {
syscallarg(int) pid;
@@ -1269,17 +1269,17 @@ int linux_sys_rt_sigsuspend(struct lwp *
int linux_sys_select(struct lwp *, const struct linux_sys_select_args *,
register_t *);
-int sys_gettimeofday(struct lwp *, const struct sys_gettimeofday_args *,
register_t *);
+int compat_50_sys_gettimeofday(struct lwp *, const struct
compat_50_sys_gettimeofday_args *, register_t *);
-int sys_settimeofday(struct lwp *, const struct sys_settimeofday_args *,
register_t *);
+int compat_50_sys_settimeofday(struct lwp *, const struct
compat_50_sys_settimeofday_args *, register_t *);
-int sys_getitimer(struct lwp *, const struct sys_getitimer_args *,
register_t *);
+int compat_50_sys_getitimer(struct lwp *, const struct
compat_50_sys_getitimer_args *, register_t *);
-int sys_setitimer(struct lwp *, const struct sys_setitimer_args *,
register_t *);
+int compat_50_sys_setitimer(struct lwp *, const struct
compat_50_sys_setitimer_args *, register_t *);
-int sys_utimes(struct lwp *, const struct sys_utimes_args *, register_t *);
+int compat_50_sys_utimes(struct lwp *, const struct
compat_50_sys_utimes_args *, register_t *);
-int sys_getrusage(struct lwp *, const struct sys_getrusage_args *,
register_t *);
+int compat_50_sys_getrusage(struct lwp *, const struct
compat_50_sys_getrusage_args *, register_t *);
int linux_sys_wait4(struct lwp *, const struct linux_sys_wait4_args *,
register_t *);
Index: sys/compat/linux/arch/alpha/linux_sysent.c
===================================================================
RCS file: /cvsroot/src/sys/compat/linux/arch/alpha/linux_sysent.c,v
retrieving revision 1.69
diff -u -p -u -p -r1.69 linux_sysent.c
--- sys/compat/linux/arch/alpha/linux_sysent.c 19 Nov 2008 18:39:44 -0000
1.69
+++ sys/compat/linux/arch/alpha/linux_sysent.c 13 Jan 2009 11:20:19 -0000
@@ -788,18 +788,18 @@ struct sysent linux_sysent[] = {
(sy_call_t *)linux_sys_rt_sigsuspend },/* 357 = rt_sigsuspend */
{ ns(struct linux_sys_select_args), 0,
(sy_call_t *)linux_sys_select }, /* 358 = select */
- { ns(struct sys_gettimeofday_args), 0,
- (sy_call_t *)sys_gettimeofday }, /* 359 = gettimeofday */
- { ns(struct sys_settimeofday_args), 0,
- (sy_call_t *)sys_settimeofday }, /* 360 = settimeofday */
- { ns(struct sys_getitimer_args), 0,
- (sy_call_t *)sys_getitimer }, /* 361 = getitimer */
- { ns(struct sys_setitimer_args), 0,
- (sy_call_t *)sys_setitimer }, /* 362 = setitimer */
- { ns(struct sys_utimes_args), 0,
- (sy_call_t *)sys_utimes }, /* 363 = utimes */
- { ns(struct sys_getrusage_args), 0,
- (sy_call_t *)sys_getrusage }, /* 364 = getrusage */
+ { ns(struct compat_50_sys_gettimeofday_args), 0,
+ (sy_call_t *)compat_50_sys_gettimeofday },/* 359 = gettimeofday */
+ { ns(struct compat_50_sys_settimeofday_args), 0,
+ (sy_call_t *)compat_50_sys_settimeofday },/* 360 = settimeofday */
+ { ns(struct compat_50_sys_getitimer_args), 0,
+ (sy_call_t *)compat_50_sys_getitimer },/* 361 = getitimer */
+ { ns(struct compat_50_sys_setitimer_args), 0,
+ (sy_call_t *)compat_50_sys_setitimer },/* 362 = setitimer */
+ { ns(struct compat_50_sys_utimes_args), 0,
+ (sy_call_t *)compat_50_sys_utimes },/* 363 = utimes */
+ { ns(struct compat_50_sys_getrusage_args), 0,
+ (sy_call_t *)compat_50_sys_getrusage },/* 364 = getrusage */
{ ns(struct linux_sys_wait4_args), 0,
(sy_call_t *)linux_sys_wait4 }, /* 365 = wait4 */
{ 0, 0, 0,
Index: sys/compat/linux/arch/alpha/syscalls.master
===================================================================
RCS file: /cvsroot/src/sys/compat/linux/arch/alpha/syscalls.master,v
retrieving revision 1.64
diff -u -p -u -p -r1.64 syscalls.master
--- sys/compat/linux/arch/alpha/syscalls.master 19 Nov 2008 18:36:03 -0000
1.64
+++ sys/compat/linux/arch/alpha/syscalls.master 13 Jan 2009 11:20:19 -0000
@@ -1,4 +1,4 @@
- $NetBSD$
+ $NetBSD: syscalls.master,v 1.64 2008/11/19 18:36:03 ad Exp $
;
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -575,18 +575,20 @@
358 STD { int linux_sys_select(int nfds, fd_set *readfds, \
fd_set *writefds, fd_set *exceptfds, \
struct timeval *timeout); }
-359 NOARGS { int sys_gettimeofday(struct timeval *tp, \
+359 NOARGS { int compat_50_sys_gettimeofday(struct timeval50 *tp, \
struct timezone *tzp); }
-360 NOARGS { int sys_settimeofday(const struct timeval *tp, \
+360 NOARGS { int compat_50_sys_settimeofday( \
+ const struct timeval50 *tp, \
const struct timezone *tzp); }
-361 NOARGS { int sys_getitimer(int which, \
- struct itimerval *itv); }
-362 NOARGS { int sys_setitimer(int which, \
- const struct itimerval *itv, \
- struct itimerval *oitv); }
-363 NOARGS { int sys_utimes(char *path, \
- struct timeval *times); }
-364 NOARGS { int sys_getrusage(int who, struct rusage *rusage); }
+361 NOARGS { int compat_50_sys_getitimer(int which, \
+ struct itimerval50 *itv); }
+362 NOARGS { int compat_50_sys_setitimer(int which, \
+ const struct itimerval50 *itv, \
+ struct itimerval50 *oitv); }
+363 NOARGS { int compat_50_sys_utimes(char *path, \
+ struct timeval50 *times); }
+364 NOARGS { int compat_50_sys_getrusage(int who, \
+ struct rusage50 *rusage); }
365 STD { int linux_sys_wait4(int pid, int *status, \
int options, struct rusage *rusage); }
366 UNIMPL adjtimex
Index: sys/compat/osf1/osf1_file.c
===================================================================
RCS file: /cvsroot/src/sys/compat/osf1/osf1_file.c,v
retrieving revision 1.31
diff -u -p -u -p -r1.31 osf1_file.c
--- sys/compat/osf1/osf1_file.c 2 Dec 2008 13:45:02 -0000 1.31
+++ sys/compat/osf1/osf1_file.c 13 Jan 2009 11:20:19 -0000
@@ -1,4 +1,4 @@
-/* $NetBSD$ */
+/* $NetBSD: osf1_file.c,v 1.31 2008/12/02 13:45:02 njoly Exp $ */
/*
* Copyright (c) 1999 Christopher G. Demetriou. All rights reserved.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD$");
+__KERNEL_RCSID(0, "$NetBSD: osf1_file.c,v 1.31 2008/12/02 13:45:02 njoly Exp
$");
#if defined(_KERNEL_OPT)
#include "opt_syscall_debug.h"
@@ -291,13 +291,9 @@ osf1_sys_lstat2(struct lwp *l, const str
int
osf1_sys_mknod(struct lwp *l, const struct osf1_sys_mknod_args *uap,
register_t *retval)
{
- struct sys_mknod_args a;
- SCARG(&a, path) = SCARG(uap, path);
- SCARG(&a, mode) = SCARG(uap, mode);
- SCARG(&a, dev) = osf1_cvt_dev_to_native(SCARG(uap, dev));
-
- return sys_mknod(l, &a, retval);
+ return do_sys_mknod(l, SCARG(uap, path), SCARG(uap, mode),
+ osf1_cvt_dev_to_native(SCARG(uap, dev)), retval);
}
int
Home |
Main Index |
Thread Index |
Old Index