Merge branch 'master' into v2.1

2013-10-24 15:21:44 +02:00
parent a014d5e65d 7e538b5f0a
commit d8f05356ca
3 changed files with 27 additions and 13 deletions
--- a/src/lj_errmsg.h
+++ b/src/lj_errmsg.h
@@ -100,6 +100,7 @@ ERRDEF(STRFMT,	"invalid option " LUA_QS " to " LUA_QL("format"))
 ERRDEF(STRGSRV,	"invalid replacement value (a %s)")
 ERRDEF(BADMODN,	"name conflict for module " LUA_QS)
 #if LJ_HASJIT
+ERRDEF(JITPROT,	"runtime code generation failed, restricted kernel?")
 #if LJ_TARGET_X86ORX64
 ERRDEF(NOJIT,	"JIT compiler disabled, CPU does not support SSE2")
 #else