From 0b194c96890c60dfe3474f69e063b8d86ce22160 Mon Sep 17 00:00:00 2001 From: Alexander Boettcher Date: Mon, 10 Nov 2014 12:58:16 +0100 Subject: [PATCH] init: restrict cpu_sessions to configured affinity Fixes #1289 --- repos/os/include/init/child.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/repos/os/include/init/child.h b/repos/os/include/init/child.h index ac3b9b4c7..b64002f04 100644 --- a/repos/os/include/init/child.h +++ b/repos/os/include/init/child.h @@ -684,16 +684,16 @@ namespace Init { { using namespace Genode; + Affinity::Space const &child_space = _resources.affinity.space(); + Affinity::Location const &child_location = _resources.affinity.location(); + /* check if no valid affinity space was specified */ if (session_affinity.space().total() == 0) - return session_affinity; + return Affinity(child_space, child_location); Affinity::Space const &session_space = session_affinity.space(); Affinity::Location const &session_location = session_affinity.location(); - Affinity::Space const &child_space = _resources.affinity.space(); - Affinity::Location const &child_location = _resources.affinity.location(); - /* scale resolution of resulting space */ Affinity::Space space(child_space.multiply(session_space));