From bb8143df6424030d499d03179bfe21a893a19408 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=C5=81ukasz=20Stelmach?= <l.stelmach@samsung.com>
Date: Fri, 19 Mar 2021 15:20:06 +0100
Subject: [PATCH] logger: move logger.h to uapi
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Move logger.h to uapi so it can be exported for userland
software to use.

Change-Id: I64dca69f3442edc246562485b0b29b43615ae881
Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
[ Pick only changes in logger.[ch] while moving code out of tree ]
Signed-off-by: Karol Lewandowski <k.lewandowsk@samsung.com>
---
 drivers/staging/android/logger.c | 2 +-
 drivers/staging/android/logger.h | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/android/logger.c b/drivers/staging/android/logger.c
index 3347706..0d21142 100644
--- a/drivers/staging/android/logger.c
+++ b/drivers/staging/android/logger.c
@@ -32,7 +32,7 @@
 #include <linux/fdtable.h>
 #include <linux/file.h>
 
-#include "logger.h"
+#include <uapi/linux/logger.h>
 
 /**
  * struct logger_log - represents a specific log, such as 'main' or 'radio'
diff --git a/drivers/staging/android/logger.h b/drivers/staging/android/logger.h
index b11e48c..a02ac11 100644
--- a/drivers/staging/android/logger.h
+++ b/drivers/staging/android/logger.h
@@ -66,7 +66,11 @@ struct logger_entry {
 	__s32		tid;
 	__s32		sec;
 	__s32		nsec;
+#ifndef __KERNEL__
+	__s32		euid;
+#else
 	kuid_t		euid;
+#endif
 	char		msg[0];
 };
 
-- 
2.34.1