diff options
| author | kib <kib@FreeBSD.org> | 2010-11-14 18:24:12 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2010-11-14 18:24:12 +0000 |
| commit | 336fd1996df470b1167f39d51c1bd90e7947c827 (patch) | |
| tree | c4fc0dde2563ce225c82fea2bdd9e0706c91a717 | |
| parent | 217241ab5e72e8cd40a82e2ba679dc66b77f22e3 (diff) | |
| download | FreeBSD-src-336fd1996df470b1167f39d51c1bd90e7947c827.zip FreeBSD-src-336fd1996df470b1167f39d51c1bd90e7947c827.tar.gz | |
Use symbolic names instead of hardcoding values for magic p_osrel constants.
MFC after: 1 week
| -rw-r--r-- | sys/amd64/amd64/trap.c | 6 | ||||
| -rw-r--r-- | sys/i386/i386/trap.c | 6 | ||||
| -rw-r--r-- | sys/sys/param.h | 5 | ||||
| -rw-r--r-- | sys/vm/vm_mmap.c | 2 |
4 files changed, 12 insertions, 7 deletions
diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index 786d8ec..a1a3ebc 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -415,9 +415,9 @@ trap(struct trapframe *frame) * This check also covers the images * without the ABI-tag ELF note. */ - if (SV_CURPROC_ABI() == - SV_ABI_FREEBSD && - p->p_osrel >= 700004) { + if (SV_CURPROC_ABI() == SV_ABI_FREEBSD + && p->p_osrel >= + __FreeBSD_version_SIGSEGV) { i = SIGSEGV; ucode = SEGV_ACCERR; } else { diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c index dc10559..b6f843a 100644 --- a/sys/i386/i386/trap.c +++ b/sys/i386/i386/trap.c @@ -461,9 +461,9 @@ trap(struct trapframe *frame) * This check also covers the images * without the ABI-tag ELF note. */ - if (SV_CURPROC_ABI() == - SV_ABI_FREEBSD && - p->p_osrel >= 700004) { + if (SV_CURPROC_ABI() == SV_ABI_FREEBSD + && p->p_osrel >= + __FreeBSD_version_SIGSEGV) { i = SIGSEGV; ucode = SEGV_ACCERR; } else { diff --git a/sys/sys/param.h b/sys/sys/param.h index acd1f51..3e4cdf6 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -60,6 +60,11 @@ #undef __FreeBSD_version #define __FreeBSD_version 900025 /* Master, propagated to newvers */ +#ifdef _KERNEL +#define __FreeBSD_version_SIGSEGV 700004 +#define __FreeBSD_version_MAP_ANON 800104 +#endif + #ifndef LOCORE #include <sys/types.h> #endif diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c index 80a2d0a..5c6f173 100644 --- a/sys/vm/vm_mmap.c +++ b/sys/vm/vm_mmap.c @@ -232,7 +232,7 @@ mmap(td, uap) /* Make sure mapping fits into numeric range, etc. */ if ((uap->len == 0 && !SV_CURPROC_FLAG(SV_AOUT) && - curproc->p_osrel >= 800104) || + curproc->p_osrel >= __FreeBSD_version_MAP_ANON) || ((flags & MAP_ANON) && (uap->fd != -1 || pos != 0))) return (EINVAL); |
