diff options
Diffstat (limited to 'executor')
| -rw-r--r-- | executor/common.h | 7 | ||||
| -rw-r--r-- | executor/executor.cc | 8 |
2 files changed, 7 insertions, 8 deletions
diff --git a/executor/common.h b/executor/common.h index 32df69001..5f042d1ec 100644 --- a/executor/common.h +++ b/executor/common.h @@ -815,9 +815,6 @@ int main(void) /*{{{MMAP_DATA}}}*/ #endif -#if SYZ_HAVE_SETUP_EXT - setup_ext(); -#endif #if SYZ_SYSCTL setup_sysctl(); #endif @@ -842,10 +839,12 @@ int main(void) #if SYZ_802154 setup_802154(); #endif - #if SYZ_HANDLE_SEGV install_segv_handler(); #endif +#if SYZ_HAVE_SETUP_EXT + setup_ext(); +#endif #if SYZ_MULTI_PROC for (procid = 0; procid < /*{{{PROCS}}}*/; procid++) { if (fork() == 0) { diff --git a/executor/executor.cc b/executor/executor.cc index b2e24f46b..3d6d8f1b8 100644 --- a/executor/executor.cc +++ b/executor/executor.cc @@ -1638,14 +1638,14 @@ void setup_features(char** enable, int n) // This does any one-time setup for the requested features on the machine. // Note: this can be called multiple times and must be idempotent. flag_debug = true; -#if SYZ_HAVE_SETUP_EXT - // This can be defined in common_ext.h. - setup_ext(); -#endif #if SYZ_HAVE_FEATURES setup_sysctl(); setup_cgroups(); #endif +#if SYZ_HAVE_SETUP_EXT + // This can be defined in common_ext.h. + setup_ext(); +#endif for (int i = 0; i < n; i++) { bool found = false; #if SYZ_HAVE_FEATURES |