diff options
| author | Roman Yeryomin <roman@advem.lv> | 2013-05-26 01:02:55 +0300 |
|---|---|---|
| committer | Roman Yeryomin <roman@advem.lv> | 2013-05-26 01:02:55 +0300 |
| commit | 342045a35b1981a89e4bc80842b10c065e1050da (patch) | |
| tree | 4140720b20e8d641c11da882010d6130a75fef21 /package/hotplug2/patches/150-force_fork_slow.patch | |
| parent | 7338133dde8238afce34676214b494c8db96689b (diff) | |
| parent | 1a116ce7818ecee5d167a9c0ebb1a0feca9120e6 (diff) | |
Merge trunk into realtek-unstable
Conflicts:
Config.in
feeds.conf.default
package/base-files/files/etc/hotplug2-common.rules
package/network/config/netifd/files/etc/init.d/network
Diffstat (limited to 'package/hotplug2/patches/150-force_fork_slow.patch')
| -rw-r--r-- | package/hotplug2/patches/150-force_fork_slow.patch | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/package/hotplug2/patches/150-force_fork_slow.patch b/package/hotplug2/patches/150-force_fork_slow.patch deleted file mode 100644 index 47101f56b..000000000 --- a/package/hotplug2/patches/150-force_fork_slow.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/workers/worker_fork.c -+++ b/workers/worker_fork.c -@@ -396,7 +396,7 @@ static int worker_fork_process(void *in_ - worker_fork_update_children(ctx); - - child = NULL; -- for (i = 0; i < ctx->children_count; i++) { -+ for (i = 0; i < ctx->children_count && i < ctx->max_children; i++) { - if (ctx->children[i]->busy == 0) { - child = ctx->children[i]; - break; -@@ -426,7 +426,8 @@ static int worker_fork_process(void *in_ - /* - * We have to fork off a new child. - */ -- if (ctx->children_count < ctx->max_children) -+ if (ctx->children_count < ctx->max_children || -+ (ruleset_flags(&ctx->settings->rules, uevent) & FLAG_SLOW)) - child = worker_fork_spawn(ctx); - - for (i = 0; i < uevent->env_vars_c; i++) { |