summaryrefslogtreecommitdiffstats
path: root/sys/i386/include/pmc_mdep.h
diff options
context:
space:
mode:
authorkib <kib@FreeBSD.org>2015-07-02 14:37:21 +0000
committerkib <kib@FreeBSD.org>2015-07-02 14:37:21 +0000
commit77205a0535aed99b4194879b73077c1a1a4bf4f6 (patch)
treea1fbffaad7b43ca5ec177ee3f3d30ff713e09b9b /sys/i386/include/pmc_mdep.h
parent6fa1b93946b24835a4849b0342944e3a8b1b3dd2 (diff)
downloadFreeBSD-src-77205a0535aed99b4194879b73077c1a1a4bf4f6.zip
FreeBSD-src-77205a0535aed99b4194879b73077c1a1a4bf4f6.tar.gz
Use single instance of the identical INKERNEL() and PMC_IN_KERNEL()
macros on amd64 and i386. Move the definition to machine/param.h. kgdb defines INKERNEL() too, the conflict is resolved by renaming kgdb version to PINKERNEL(). On i386, correct the lowest kernel address. After the shared page was introduced, USRSTACK no longer points to the last user address + 1 [*] Submitted by: Oliver Pinter [*] Sponsored by: The FreeBSD Foundation MFC after: 1 week
Diffstat (limited to 'sys/i386/include/pmc_mdep.h')
-rw-r--r--sys/i386/include/pmc_mdep.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/i386/include/pmc_mdep.h b/sys/i386/include/pmc_mdep.h
index 5ce791a..ff057ce 100644
--- a/sys/i386/include/pmc_mdep.h
+++ b/sys/i386/include/pmc_mdep.h
@@ -138,8 +138,7 @@ struct pmc_mdep;
#define PMC_IN_KERNEL_STACK(S,START,END) \
((S) >= (START) && (S) < (END))
-#define PMC_IN_KERNEL(va) (((va) >= USRSTACK) && \
- ((va) < VM_MAX_KERNEL_ADDRESS))
+#define PMC_IN_KERNEL(va) INKERNEL(va)
#define PMC_IN_USERSPACE(va) ((va) <= VM_MAXUSER_ADDRESS)
OpenPOWER on IntegriCloud