diff options
author | netchild <netchild@FreeBSD.org> | 2006-08-15 15:15:17 +0000 |
---|---|---|
committer | netchild <netchild@FreeBSD.org> | 2006-08-15 15:15:17 +0000 |
commit | 5657c7ac9ee943aca6304a3cf3d80495c2ad0e93 (patch) | |
tree | e1f3c10158349676bc9358366f9b862887c860fd /sys | |
parent | e008ba12145d26e64e034df8ad328459032c16aa (diff) | |
download | FreeBSD-src-5657c7ac9ee943aca6304a3cf3d80495c2ad0e93.zip FreeBSD-src-5657c7ac9ee943aca6304a3cf3d80495c2ad0e93.tar.gz |
Disable some parts of the code on amd64 for now to prevent a panic. A better
fix will come later.
Sponsored by: Google SoC 2006
Submitted by: rdivacky
Diffstat (limited to 'sys')
-rw-r--r-- | sys/compat/linux/linux_misc.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index 848c114..b209f78 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -1334,6 +1334,7 @@ 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; em = em_find(td->td_proc, EMUL_UNLOCKED); @@ -1342,6 +1343,9 @@ linux_getpid(struct thread *td, struct linux_getpid_args *args) td->td_retval[0] = em->shared->group_pid; EMUL_UNLOCK(&emul_lock); +#else + td->td_retval[0] = td->td_proc->p_pid; +#endif return (0); } @@ -1361,6 +1365,7 @@ 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; @@ -1393,7 +1398,9 @@ 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); } |