diff options
| author | Renato Botelho <renato@netgate.com> | 2016-08-17 15:23:38 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-08-17 15:23:38 -0300 |
| commit | 75cd8d40056c799f03b759475d9bfd10ba266a6c (patch) | |
| tree | 60433235501684bffeab90e65139a8285fcf46a9 /sys/i386 | |
| parent | 99990a0d149f0eae805aa1f49d4a61be30c3b000 (diff) | |
| parent | ad413762f28e3be343987e707b9cf4f10f963693 (diff) | |
| download | FreeBSD-src-75cd8d40056c799f03b759475d9bfd10ba266a6c.zip FreeBSD-src-75cd8d40056c799f03b759475d9bfd10ba266a6c.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'sys/i386')
| -rw-r--r-- | sys/i386/i386/trap.c | 4 | ||||
| -rw-r--r-- | sys/i386/linux/linux_ptrace.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c index 2fcf690..a186ff5 100644 --- a/sys/i386/i386/trap.c +++ b/sys/i386/i386/trap.c @@ -534,8 +534,8 @@ trap(struct trapframe *frame) case T_DNA: #ifdef DEV_NPX - KASSERT(!PCB_USER_FPU(td->td_pcb), - ("Unregistered use of FPU in kernel")); + if (PCB_USER_FPU(td->td_pcb)) + panic("Unregistered use of FPU in kernel"); if (npxdna()) goto out; #endif diff --git a/sys/i386/linux/linux_ptrace.c b/sys/i386/linux/linux_ptrace.c index 2925e6b..fbe66b4 100644 --- a/sys/i386/linux/linux_ptrace.c +++ b/sys/i386/linux/linux_ptrace.c @@ -69,7 +69,7 @@ __FBSDID("$FreeBSD$"); #define PTRACE_ATTACH 16 #define PTRACE_DETACH 17 -#define PTRACE_SYSCALL 24 +#define LINUX_PTRACE_SYSCALL 24 #define PTRACE_GETREGS 12 #define PTRACE_SETREGS 13 @@ -473,7 +473,7 @@ linux_ptrace(struct thread *td, struct linux_ptrace_args *uap) break; } - case PTRACE_SYSCALL: + case LINUX_PTRACE_SYSCALL: /* fall through */ default: printf("linux: ptrace(%u, ...) not implemented\n", |
