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

Unverified Commit 1af66fd0 authored by Alexander Grund's avatar Alexander Grund
Browse files

Merge remote-tracking branch 'kernel/linux-4.4.y' into lineage-4.4.279 

Change-Id: Icd777acc0fb1285452482aae7597ee427cd80254
parents 7f985237 aff9d4e6

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 277

SUBLEVEL = 279

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/arm/boot/dts/versatile-ab.dts

+2 −3
Original line number Diff line number Diff line
@@ -93,16 +93,15 @@ 
		#size-cells = <1>;

		ranges;



		vic: intc@10140000 {

		vic: interrupt-controller@10140000 {

			compatible = "arm,versatile-vic";

			interrupt-controller;

			#interrupt-cells = <1>;

			reg = <0x10140000 0x1000>;

			clear-mask = <0xffffffff>;

			valid-mask = <0xffffffff>;

		};



		sic: intc@10003000 {

		sic: interrupt-controller@10003000 {

			compatible = "arm,versatile-sic";

			interrupt-controller;

			#interrupt-cells = <1>;

arch/arm/boot/dts/versatile-pb.dts

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 


	amba {

		/* The Versatile PB is using more SIC IRQ lines than the AB */

		sic: intc@10003000 {

		sic: interrupt-controller@10003000 {

			clear-mask = <0xffffffff>;

			/*

			 * Valid interrupt lines mask according to

arch/arm/kernel/signal.c

+8 −6
Original line number Diff line number Diff line
@@ -626,18 +626,20 @@ struct page *get_signal_page(void) 


	addr = page_address(page);



	/* Poison the entire page */

	memset32(addr, __opcode_to_mem_arm(0xe7fddef1),

		 PAGE_SIZE / sizeof(u32));



	/* Give the signal return code some randomness */

	offset = 0x200 + (get_random_int() & 0x7fc);

	signal_return_offset = offset;



	/*

	 * Copy signal return handlers into the vector page, and

	 * set sigreturn to be a pointer to these.

	 */

	/* Copy signal return handlers into the page */

	memcpy(addr + offset, sigreturn_codes, sizeof(sigreturn_codes));



	ptr = (unsigned long)addr + offset;

	flush_icache_range(ptr, ptr + sizeof(sigreturn_codes));

	/* Flush out all instructions in this page */

	ptr = (unsigned long)addr;

	flush_icache_range(ptr, ptr + PAGE_SIZE);



	return page;

}

arch/x86/include/asm/proto.h

+2 −0
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ 


#include <asm/ldt.h>



struct task_struct;



/* misc architecture specific prototypes */



void syscall_init(void);