Merge branch 'rickard/ds-20-fix'

* rickard/ds-20-fix:
  Fix unused warning
  Change exception for enif_schedule_nif() with dirty flags
  Remove double check of NifExport when checking process code

3 files changed, 6 insertions, 6 deletions

diff --git a/erts/emulator/beam/beam_bif_load.c b/erts/emulator/beam/beam_bif_load.c
index c8dde8caf8..a5891a0ec2 100644
--- a/erts/emulator/beam/beam_bif_load.c
+++ b/erts/emulator/beam/beam_bif_load.c
@@ -1120,11 +1120,6 @@ check_process_code(Process* rp, Module* modp, int *redsp, int fcalls)
     if (erts_check_nif_export_in_area(rp, mod_start, mod_size))
 	return am_true;
 
-    *redsp += 1;
-
-    if (erts_check_nif_export_in_area(rp, mod_start, mod_size))
-	return am_true;
-
     *redsp += (STACK_START(rp) - rp->stop) / 32;
 
     /*
diff --git a/erts/emulator/beam/erl_nif.c b/erts/emulator/beam/erl_nif.c
index 47b5b23614..7c7a32f234 100644
--- a/erts/emulator/beam/erl_nif.c
+++ b/erts/emulator/beam/erl_nif.c
@@ -2538,10 +2538,13 @@ enif_schedule_nif(ErlNifEnv* env, const char* fun_name, int flags,
     if (flags == 0)
 	result = schedule(env, execute_nif, fp, proc->current->module,
 			  fun_name_atom, argc, argv);
+    else if (!(flags & ~(ERL_NIF_DIRTY_JOB_IO_BOUND|ERL_NIF_DIRTY_JOB_CPU_BOUND))) {
 #ifdef ERTS_DIRTY_SCHEDULERS
-    else if (!(flags & ~(ERL_NIF_DIRTY_JOB_IO_BOUND|ERL_NIF_DIRTY_JOB_CPU_BOUND)))
 	result = schedule_dirty_nif(env, flags, fp, fun_name_atom, argc, argv);
+#else
+        result = enif_raise_exception(env, am_notsup);
 #endif
+    }
     else
 	result = enif_make_badarg(env);
 
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c
index f80ebdf31b..641a8fb3e8 100644
--- a/erts/emulator/beam/erl_process.c
+++ b/erts/emulator/beam/erl_process.c
@@ -127,11 +127,13 @@ runq_got_work_to_execute_flags(Uint32 flags)
     return !ERTS_IS_RUNQ_EMPTY_FLGS(flags);
 }
 
+#ifdef ERTS_SMP
 static ERTS_INLINE int
 runq_got_work_to_execute(ErtsRunQueue *rq)
 {
     return runq_got_work_to_execute_flags(ERTS_RUNQ_FLGS_GET_NOB(rq));
 }
+#endif
 
 #undef RUNQ_READ_RQ
 #undef RUNQ_SET_RQ