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

Commit b41e65f5 authored by Alex Shi's avatar Alex Shi
Browse files

Merge remote-tracking branch 'lts/linux-3.18.y' into linux-linaro-lsk-v3.18 

Conflicts:
	include/linux/compiler-gcc.h
parents c52149e0 83412555

Documentation/kernel-parameters.txt

+2 −0
Original line number Diff line number Diff line
@@ -3651,6 +3651,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
					sector if the number is odd);

				i = IGNORE_DEVICE (don't bind to this

					device);

				j = NO_REPORT_LUNS (don't use report luns

					command, uas only);

				l = NOT_LOCKABLE (don't try to lock and

					unlock ejectable media);

				m = MAX_SECTORS_64 (don't transfer more

Makefile

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

PATCHLEVEL = 18

SUBLEVEL = 31

SUBLEVEL = 32

EXTRAVERSION =

NAME = Diseased Newt

arch/arm/mach-omap2/omap_hwmod.c

+4 −4
Original line number Diff line number Diff line
@@ -1439,8 +1439,6 @@ static void _enable_sysc(struct omap_hwmod *oh) 
	    (sf & SYSC_HAS_CLOCKACTIVITY))

		_set_clockactivity(oh, oh->class->sysc->clockact, &v);



	/* If the cached value is the same as the new value, skip the write */

	if (oh->_sysc_cache != v)

	_write_sysconfig(v, oh);



	/*
@@ -1504,6 +1502,8 @@ static void _idle_sysc(struct omap_hwmod *oh) 
		_set_master_standbymode(oh, idlemode, &v);

	}



	/* If the cached value is the same as the new value, skip the write */

	if (oh->_sysc_cache != v)

		_write_sysconfig(v, oh);

}

arch/parisc/include/asm/uaccess.h

+1 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ struct exception_table_entry { 
 */

struct exception_data {

	unsigned long fault_ip;

	unsigned long fault_gp;

	unsigned long fault_space;

	unsigned long fault_addr;

};

arch/parisc/kernel/asm-offsets.c

+1 −0
Original line number Diff line number Diff line
@@ -292,6 +292,7 @@ int main(void) 
	DEFINE(ASM_PT_INITIAL, PT_INITIAL);

	BLANK();

	DEFINE(EXCDATA_IP, offsetof(struct exception_data, fault_ip));

	DEFINE(EXCDATA_GP, offsetof(struct exception_data, fault_gp));

	DEFINE(EXCDATA_SPACE, offsetof(struct exception_data, fault_space));

	DEFINE(EXCDATA_ADDR, offsetof(struct exception_data, fault_addr));

	BLANK();