diff options
| author | netchild <netchild@FreeBSD.org> | 2006-08-20 13:50:27 +0000 |
|---|---|---|
| committer | netchild <netchild@FreeBSD.org> | 2006-08-20 13:50:27 +0000 |
| commit | b6f1fc8049d7d7e9959ba2cf3231cdca78090edc (patch) | |
| tree | 6b691e5224038af30034053677311944da43007b /sys/compat/linux/linux_misc.c | |
| parent | b61dcb226b7d27c26c5af3539ac9598e1d486dfe (diff) | |
| download | FreeBSD-src-b6f1fc8049d7d7e9959ba2cf3231cdca78090edc.zip FreeBSD-src-b6f1fc8049d7d7e9959ba2cf3231cdca78090edc.tar.gz | |
Sync the MI parts for amd64 with i386 and remove the corresponding special
handling for amd64 in the common code. The MD parts for amd64 are still
outstanding, but at least this fixes some panics on amd64.
Sponsored by: Google SoC 2006
Submitted by: rdivacky
Tested by: bsam
Diffstat (limited to 'sys/compat/linux/linux_misc.c')
| -rw-r--r-- | sys/compat/linux/linux_misc.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index d8be75a..f394e55 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -1331,7 +1331,6 @@ linux_reboot(struct thread *td, struct linux_reboot_args *args) int linux_getpid(struct thread *td, struct linux_getpid_args *args) { -#ifdef __i386__ struct linux_emuldata *em; char osrel[LINUX_MAX_UTSNAME]; @@ -1346,11 +1345,7 @@ linux_getpid(struct thread *td, struct linux_getpid_args *args) td->td_retval[0] = td->td_proc->p_pid; PROC_UNLOCK(td->td_proc); } -#else - PROC_LOCK(td->td_proc); - td->td_retval[0] = td->td_proc->p_pid; - PROC_UNLOCK(td->td_proc); -#endif + return (0); } @@ -1370,7 +1365,6 @@ linux_gettid(struct thread *td, struct linux_gettid_args *args) int linux_getppid(struct thread *td, struct linux_getppid_args *args) { -#ifdef __i386__ struct linux_emuldata *em; struct proc *p, *pp; char osrel[LINUX_MAX_UTSNAME]; @@ -1412,9 +1406,6 @@ linux_getppid(struct thread *td, struct linux_getppid_args *args) EMUL_UNLOCK(&emul_lock); PROC_UNLOCK(pp); -#else - return getppid(td, (struct getppid_args *) args); -#endif return (0); } @@ -1481,7 +1472,6 @@ linux_sethostname(struct thread *td, struct linux_sethostname_args *args) int linux_exit_group(struct thread *td, struct linux_exit_group_args *args) { -#ifdef __i386__ struct linux_emuldata *em, *td_em, *tmp_em; struct proc *sp; char osrel[LINUX_MAX_UTSNAME]; @@ -1513,10 +1503,8 @@ linux_exit_group(struct thread *td, struct linux_exit_group_args *args) EMUL_SHARED_RUNLOCK(&emul_shared_lock); EMUL_UNLOCK(&emul_lock); } -#endif exit1(td, W_EXITCODE(args->error_code,0)); return (0); } - |
