From c0a2388978e10e03e8db60c5162292d07784b7d7 Mon Sep 17 00:00:00 2001
From: Alexander Boettcher <alexander.boettcher@genode-labs.com>
Date: Mon, 11 Jan 2016 09:02:38 +0100
Subject: [PATCH] x86: avoid warning if memory is attached twice

Issue #1848
---
 repos/os/src/drivers/platform/spec/x86/device_pd/main.cc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/repos/os/src/drivers/platform/spec/x86/device_pd/main.cc b/repos/os/src/drivers/platform/spec/x86/device_pd/main.cc
index 3ad0cb3a1..f2633bd0c 100644
--- a/repos/os/src/drivers/platform/spec/x86/device_pd/main.cc
+++ b/repos/os/src/drivers/platform/spec/x86/device_pd/main.cc
@@ -105,6 +105,9 @@ void Platform::Device_pd_component::attach_dma_mem(Genode::Dataspace_capability
 		page = rm_session()->attach_at(ds_cap, phys);
 	} catch (Rm_session::Out_of_metadata) {
 		throw;
+	} catch (Rm_session::Region_conflict) {
+		/* memory already attached before - done */
+		return;
 	} catch (...) { }
 
 	/* sanity check */