From b1f1332ebbd496f2bdc7e15bf4ab4096f3cacdff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <jerome.duval@gmail.com>
Date: Thu, 5 Apr 2018 17:43:20 +0200
Subject: [PATCH] PackageKit: use the correct kernel headers.

The debug build of the packagefs kernel addon failed because user_memcpy had no type.
Using the correct headers for user_memcpy and IS_USER_ADDRESS fixed the issue.
---
 src/kits/package/hpkg/DataReader.cpp | 5 ++++-
 src/kits/support/DataIO.cpp          | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/kits/package/hpkg/DataReader.cpp b/src/kits/package/hpkg/DataReader.cpp
index f6e4984f4b..b50955f03c 100644
--- a/src/kits/package/hpkg/DataReader.cpp
+++ b/src/kits/package/hpkg/DataReader.cpp
@@ -11,7 +11,10 @@
 #include <string.h>
 
 #if defined(_KERNEL_MODE) && !defined(_BOOT_MODE)
-#include <arch/user_memory.h>
+// for user_memcpy() and IS_USER_ADDRESS()
+#include <KernelExport.h>
+
+#include <kernel.h>
 #endif
 
 
diff --git a/src/kits/support/DataIO.cpp b/src/kits/support/DataIO.cpp
index f9e1121fc0..e13f21921c 100644
--- a/src/kits/support/DataIO.cpp
+++ b/src/kits/support/DataIO.cpp
@@ -16,7 +16,10 @@
 #include <Errors.h>
 
 #if defined(_KERNEL_MODE) && !defined(_BOOT_MODE)
-#include <arch/user_memory.h>
+// for user_memcpy() and IS_USER_ADDRESS()
+#include <KernelExport.h>
+
+#include <kernel.h>
 #endif