From d1b9548884b766252263c82fbcb8b2579a9a21f9 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>
---
 drivers/staging/android/logger.c                         | 2 +-
 {drivers/staging/android => include/uapi/linux}/logger.h | 4 ++++
 tools/testing/selftests/logger/logger.c                  | 5 +----
 3 files changed, 6 insertions(+), 5 deletions(-)
 rename {drivers/staging/android => include/uapi/linux}/logger.h (98%)

diff --git a/drivers/staging/android/logger.c b/drivers/staging/android/logger.c
index 7983e57..d7707b6 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/include/uapi/linux/logger.h
similarity index 98%
rename from drivers/staging/android/logger.h
rename to include/uapi/linux/logger.h
index b11e48c..a02ac117e 100644
--- a/drivers/staging/android/logger.h
+++ b/include/uapi/linux/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];
 };
 
diff --git a/tools/testing/selftests/logger/logger.c b/tools/testing/selftests/logger/logger.c
index 0446e79..5f0bd3b 100644
--- a/tools/testing/selftests/logger/logger.c
+++ b/tools/testing/selftests/logger/logger.c
@@ -2,6 +2,7 @@
 #include <fcntl.h>
 #include <getopt.h>
 #include <linux/const.h>
+#include <linux/logger.h>
 #include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -12,10 +13,6 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
-#define LOGGER_SET_VERSION 44550
-#define LOGGER_SET_TAG 44551
-#define LOGGER_SET_PRIO 44552
-
 #define handle_error_en(en, msg)					\
 	do { errno = en; perror(msg); exit(EXIT_FAILURE); } while (0)
 
-- 
2.7.4