From bc764d6bb1726aad67f126b635cd0c910677a474 Mon Sep 17 00:00:00 2001 From: Zoltan Varga Date: Fri, 11 Dec 2009 19:53:23 +0000 Subject: [PATCH] 2009-12-11 Zoltan Varga * driver.c: Applied patch from Matt McClellan (matt@mc-c.net). Add a check for 2 parameter sched_setaffinity in older glibc versions. Fixes #564000. svn path=/branches/mono-2-6/mono/; revision=148125 --- mono/mini/ChangeLog | 6 ++++++ mono/mini/driver.c | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog index 51725f5ea60..50bf0444089 100644 --- a/mono/mini/ChangeLog +++ b/mono/mini/ChangeLog @@ -1,3 +1,9 @@ +2009-12-11 Zoltan Varga + + * driver.c: Applied patch from Matt McClellan (matt@mc-c.net). Add a check + for 2 parameter sched_setaffinity in older glibc versions. Fixes + #564000. + 2009-12-10 Zoltan Varga * aot-compiler.c (add_wrappers): Avoid generating synchronized wrappers for diff --git a/mono/mini/driver.c b/mono/mini/driver.c index 3b23f605b5c..d80d65f8dd8 100644 --- a/mono/mini/driver.c +++ b/mono/mini/driver.c @@ -1293,7 +1293,11 @@ mono_main (int argc, char* argv[]) #if HAVE_SCHED_SETAFFINITY if (getenv ("MONO_NO_SMP")) { unsigned long proc_mask = 1; +#ifdef GLIBC_BEFORE_2_3_4_SCHED_SETAFFINITY + sched_setaffinity (getpid(), (gpointer)&proc_mask); +#else sched_setaffinity (getpid(), sizeof (unsigned long), (gpointer)&proc_mask); +#endif } #endif if (!g_thread_supported ()) -- 2.11.4.GIT