commit 27116babeb4b68f6da9628f32b17251141c24cdb
author maxwen <max.weninger@gmail.com> Fri Aug 14 21:41:28 2015 +0200
committer Ethan Yonker <dees_troy@teamw.in> Thu Oct 15 14:54:06 2015 -0500
tree 6880bf3c93c160c176ba7b1706436f2ed90f06b4
parent cd3f398fa3715f3fd0850b2b26d660595dc7e7cd

busybox: squashed commit of merging cm-12.1

With fixes to LOCAL_C_INCLUDES for libsepol in M and fixed
some missing includes to enable building for 64 bit devices

Conflicts:
	Android.mk
	android/libc/arch-x86/syscalls/swapoff.S
	android/libc/arch-x86/syscalls/swapon.S
	android/libc/arch-x86/syscalls/sysinfo.S
	android/librpc/pmap_rmt.c
	android/reboot.c
	include-full/copy-current.sh
	include-minimal/copy-current.sh
	include/platform.h
	networking/interface.c
	networking/nslookup.c

Change-Id: If6092fa87f3d21190db1af4f70daa150eb462660

selinux/chcon.c

diff --git a/selinux/chcon.c b/selinux/chcon.c
index f947c2c..d1e9047 100644
--- a/selinux/chcon.c
+++ b/selinux/chcon.c
@@ -201,7 +201,7 @@
 		fname[fname_len] = '\0';
 
 		if (recursive_action(fname,
-					1<<option_mask32 & OPT_RECURSIVE,
+					option_mask32 & OPT_RECURSIVE,
 					change_filedir_context,
 					change_filedir_context,
 					NULL, 0) != TRUE)