From 098ee1cfeaf3388aefaaec696cb419c7307a44ae Mon Sep 17 00:00:00 2001
From: Connor O'Brien <connoro@google.com>
Date: Wed, 7 Mar 2018 12:48:41 -0800
Subject: ANDROID: proc: fix config & includes for /proc/uid

Per-UID proc files require rtmutex, so add an include statement and
make CONFIG_PROC_UID depend on CONFIG_RT_MUTEXES

Bug: 74338318
Test: Previously broken bcm63xx and stm32 builds now succeed.
Change-Id: Id9d44775cf9ea04319d21d833a4666e3dfc16b40
Signed-off-by: Connor O'Brien <connoro@google.com>
---
 fs/proc/Kconfig | 2 +-
 fs/proc/uid.c   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/fs/proc/Kconfig b/fs/proc/Kconfig
index 523bfc094e42..08dce22afec1 100644
--- a/fs/proc/Kconfig
+++ b/fs/proc/Kconfig
@@ -85,6 +85,6 @@ config PROC_CHILDREN
 config PROC_UID
 	bool "Include /proc/uid/ files"
 	default y
-	depends on PROC_FS
+	depends on PROC_FS && RT_MUTEXES
 	help
 	Provides aggregated per-uid information under /proc/uid.
diff --git a/fs/proc/uid.c b/fs/proc/uid.c
index c0d439a00560..616d99b157c3 100644
--- a/fs/proc/uid.c
+++ b/fs/proc/uid.c
@@ -7,6 +7,7 @@
 #include <linux/hashtable.h>
 #include <linux/init.h>
 #include <linux/proc_fs.h>
+#include <linux/rtmutex.h>
 #include <linux/sched.h>
 #include <linux/seq_file.h>
 #include <linux/slab.h>
-- 
cgit v1.2.3