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

Commit fd95dadf authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge android-4.4.133 (3f51ea2d) into msm-4.4"

parents 33b2567c 9848856f

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 4

SUBLEVEL = 132

SUBLEVEL = 133

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/alpha/include/asm/futex.h

+5 −21
Original line number Diff line number Diff line
@@ -29,18 +29,10 @@ 
	:	"r" (uaddr), "r"(oparg)				\

	:	"memory")



static inline int futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)

static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval,

		u32 __user *uaddr)

{

	int op = (encoded_op >> 28) & 7;

	int cmp = (encoded_op >> 24) & 15;

	int oparg = (encoded_op << 8) >> 20;

	int cmparg = (encoded_op << 20) >> 20;

	int oldval = 0, ret;

	if (encoded_op & (FUTEX_OP_OPARG_SHIFT << 28))

		oparg = 1 << oparg;



	if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))

		return -EFAULT;



	pagefault_disable();
@@ -66,17 +58,9 @@ static inline int futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr) 


	pagefault_enable();



	if (!ret) {

		switch (cmp) {

		case FUTEX_OP_CMP_EQ: ret = (oldval == cmparg); break;

		case FUTEX_OP_CMP_NE: ret = (oldval != cmparg); break;

		case FUTEX_OP_CMP_LT: ret = (oldval < cmparg); break;

		case FUTEX_OP_CMP_GE: ret = (oldval >= cmparg); break;

		case FUTEX_OP_CMP_LE: ret = (oldval <= cmparg); break;

		case FUTEX_OP_CMP_GT: ret = (oldval > cmparg); break;

		default: ret = -ENOSYS;

		}

	}

	if (!ret)

		*oval = oldval;



	return ret;

}

arch/arc/include/asm/futex.h

+5 −35
Original line number Diff line number Diff line
@@ -73,20 +73,11 @@ 


#endif



static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)

static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval,

		u32 __user *uaddr)

{

	int op = (encoded_op >> 28) & 7;

	int cmp = (encoded_op >> 24) & 15;

	int oparg = (encoded_op << 8) >> 20;

	int cmparg = (encoded_op << 20) >> 20;

	int oldval = 0, ret;



	if (encoded_op & (FUTEX_OP_OPARG_SHIFT << 28))

		oparg = 1 << oparg;



	if (!access_ok(VERIFY_WRITE, uaddr, sizeof(int)))

		return -EFAULT;



#ifndef CONFIG_ARC_HAS_LLSC

	preempt_disable();	/* to guarantee atomic r-m-w of futex op */

#endif
@@ -118,30 +109,9 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr) 
	preempt_enable();

#endif



	if (!ret) {

		switch (cmp) {

		case FUTEX_OP_CMP_EQ:

			ret = (oldval == cmparg);

			break;

		case FUTEX_OP_CMP_NE:

			ret = (oldval != cmparg);

			break;

		case FUTEX_OP_CMP_LT:

			ret = (oldval < cmparg);

			break;

		case FUTEX_OP_CMP_GE:

			ret = (oldval >= cmparg);

			break;

		case FUTEX_OP_CMP_LE:

			ret = (oldval <= cmparg);

			break;

		case FUTEX_OP_CMP_GT:

			ret = (oldval > cmparg);

			break;

		default:

			ret = -ENOSYS;

		}

	}

	if (!ret)

		*oval = oldval;



	return ret;

}

arch/arm/boot/dts/imx6qdl-wandboard.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -88,7 +88,6 @@ 
		clocks = <&clks 201>;

		VDDA-supply = <&reg_2p5v>;

		VDDIO-supply = <&reg_3p3v>;

		lrclk-strength = <3>;

	};

};

arch/arm/include/asm/assembler.h

+10 −0
Original line number Diff line number Diff line
@@ -530,4 +530,14 @@ THUMB( orr \reg , \reg , #PSR_T_BIT ) 
#endif

	.endm



#ifdef CONFIG_KPROBES

#define _ASM_NOKPROBE(entry)				\

	.pushsection "_kprobe_blacklist", "aw" ;	\

	.balign 4 ;					\

	.long entry;					\

	.popsection

#else

#define _ASM_NOKPROBE(entry)

#endif



#endif /* __ASM_ASSEMBLER_H__ */