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

Commit 10fd238c authored by Alex Shi's avatar Alex Shi
Browse files

Merge remote-tracking branch 'lts/linux-4.4.y' into linux-linaro-lsk-v4.4 

Conflicts:
	resovle the conflict on pax_copy for
	arch/ia64/include/asm/uaccess.h
	arch/powerpc/include/asm/uaccess.h
	arch/sparc/include/asm/uaccess_32.h
parents e4f4f9e5 8d5e93bb

Documentation/devicetree/bindings/iio/adc/rockchip-saradc.txt

+7 −0
Original line number Diff line number Diff line
@@ -12,6 +12,11 @@ Required properties: 
- vref-supply: The regulator supply ADC reference voltage.

- #io-channel-cells: Should be 1, see ../iio-bindings.txt



Optional properties:

- resets: Must contain an entry for each entry in reset-names if need support

	  this option. See ../reset/reset.txt for details.

- reset-names: Must include the name "saradc-apb".



Example:

	saradc: saradc@2006c000 {

		compatible = "rockchip,saradc";
@@ -19,6 +24,8 @@ Example: 
		interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&cru SCLK_SARADC>, <&cru PCLK_SARADC>;

		clock-names = "saradc", "apb_pclk";

		resets = <&cru SRST_SARADC>;

		reset-names = "saradc-apb";

		#io-channel-cells = <1>;

		vref-supply = <&vcc18>;

	};

Documentation/mic/mpssd/mpssd.c

+2 −2
Original line number Diff line number Diff line
@@ -1538,9 +1538,9 @@ set_cmdline(struct mic_info *mic) 


	len = snprintf(buffer, PATH_MAX,

		"clocksource=tsc highres=off nohz=off ");

	len += snprintf(buffer + len, PATH_MAX,

	len += snprintf(buffer + len, PATH_MAX - len,

		"cpufreq_on;corec6_off;pc3_off;pc6_off ");

	len += snprintf(buffer + len, PATH_MAX,

	len += snprintf(buffer + len, PATH_MAX - len,

		"ifcfg=static;address,172.31.%d.1;netmask,255.255.255.0",

		mic->id + 1);

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 21

SUBLEVEL = 22

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/alpha/include/asm/uaccess.h

+8 −11
Original line number Diff line number Diff line
@@ -371,14 +371,6 @@ __copy_tofrom_user_nocheck(void *to, const void *from, long len) 
	return __cu_len;

}



extern inline long

__copy_tofrom_user(void *to, const void *from, long len, const void __user *validate)

{

	if (__access_ok((unsigned long)validate, len, get_fs()))

		len = __copy_tofrom_user_nocheck(to, from, len);

	return len;

}



#define __copy_to_user(to, from, n)					\

({									\

	__chk_user_ptr(to);						\
@@ -393,17 +385,22 @@ __copy_tofrom_user(void *to, const void *from, long len, const void __user *vali 
#define __copy_to_user_inatomic __copy_to_user

#define __copy_from_user_inatomic __copy_from_user





extern inline long

copy_to_user(void __user *to, const void *from, long n)

{

	return __copy_tofrom_user((__force void *)to, from, n, to);

	if (likely(__access_ok((unsigned long)to, n, get_fs())))

		n = __copy_tofrom_user_nocheck((__force void *)to, from, n);

	return n;

}



extern inline long

copy_from_user(void *to, const void __user *from, long n)

{

	return __copy_tofrom_user(to, (__force void *)from, n, from);

	if (likely(__access_ok((unsigned long)from, n, get_fs())))

		n = __copy_tofrom_user_nocheck(to, (__force void *)from, n);

	else

		memset(to, 0, n);

	return n;

}



extern void __do_clear_user(void);

arch/arc/include/asm/pgtable.h

+1 −2
Original line number Diff line number Diff line
@@ -277,8 +277,7 @@ static inline void pmd_set(pmd_t *pmdp, pte_t *ptep) 


#define mk_pte(page, prot)	pfn_pte(page_to_pfn(page), prot)

#define pte_pfn(pte)		(pte_val(pte) >> PAGE_SHIFT)

#define pfn_pte(pfn, prot)	(__pte(((pte_t)(pfn) << PAGE_SHIFT) | \

				 pgprot_val(prot)))

#define pfn_pte(pfn, prot)	(__pte(((pfn) << PAGE_SHIFT) | pgprot_val(prot)))

#define __pte_index(addr)	(((addr) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))



/*