Merge commit '365369847f2827b14b96c52d0fbaf9cce404e68a' into upstream-merge

* commit '365369847f2827b14b96c52d0fbaf9cce404e68a':
  tcg: increase TCG_MAX_OP_SIZE to 192
  tcg: initial mips support
  target-mips: use physical address in lladdr
  target-mips: add a function to do virtual -> physical translations
  target-mips: split code raising MMU exception in a separate function
  target-mips: factorize load/store code in op_helper.c
  Fix commit a167ba50851cdac2fa36633587e98c5956cd6b18
  Add support for GNU/kFreeBSD

Signed-off-by: Avi Kivity <avi@redhat.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/exec.c b/exec.c
index fcffb0f30..9413e2953 100644
--- a/exec.c
+++ b/exec.c
@@ -475,7 +475,7 @@ static void code_gen_alloc(unsigned long tb_size)
             exit(1);
         }
     }
-#elif defined(__FreeBSD__) || defined(__DragonFly__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
     {
         int flags;
         void *addr = NULL;