--- src/sys/sys/systm.h 2008/07/23 17:22:33 1.80 +++ src/sys/sys/systm.h 2008/09/11 00:35:49 1.81 @@ -103,8 +103,11 @@ extern int nfs_diskless_valid; /* NFS di extern vm_paddr_t Maxmem; /* Highest physical memory address in system */ #ifdef INVARIANTS /* The option is always available */ -#define KASSERT(exp,msg) do { if (!(exp)) panic msg; } while (0) -#define KKASSERT(exp) if (!(exp)) panic("assertion: %s in %s", #exp, __func__) +#define KASSERT(exp,msg) do { if (__predict_false(!(exp))) \ + panic msg; } while (0) +#define KKASSERT(exp) do { if (__predict_false(!(exp))) \ + panic("assertion: %s in %s", \ + #exp, __func__); } while (0) #else #define KASSERT(exp,msg) #define KKASSERT(exp)