Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e2d87cd authored by Christian Brauner's avatar Christian Brauner Committed by Hridya Valsaraju
Browse files

UPSTREAM: binderfs: handle !CONFIG_IPC_NS builds 

kbuild reported a build faile in [1]. This is triggered when CONFIG_IPC_NS
is not set. So let's make the use of init_ipc_ns conditional on
CONFIG_IPC_NS being set.

[1]: https://lists.01.org/pipermail/kbuild-all/2019-January/056903.html



Signed-off-by: default avatarChristian Brauner <christian.brauner@ubuntu.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>

Bug: 136497735
(cherry picked from commit 7fefaadd6a962987baac50e7b3c4c3d5ef9b55c6)
Change-Id: I97b0a7a13a82d79d97fe340d4267795e4e6442c7
Signed-off-by: default avatarHridya Valsaraju <hridya@google.com>
parent cbfaab8a

drivers/android/binderfs.c

+4 −0
Original line number Diff line number Diff line
@@ -129,7 +129,11 @@ static int binderfs_binder_device_create(struct inode *ref_inode, 
	struct inode *inode = NULL;

	struct super_block *sb = ref_inode->i_sb;

	struct binderfs_info *info = sb->s_fs_info;

#if defined(CONFIG_IPC_NS)

	bool use_reserve = (info->ipc_ns == &init_ipc_ns);

#else

	bool use_reserve = true;

#endif



	/* Reserve new minor number for the new device. */

	mutex_lock(&binderfs_minors_mutex);