Commit 3e22e20f authored by popcornmix's avatar popcornmix
Browse files

Merge remote-tracking branch 'stable/linux-4.9.y' into rpi-4.9.y

parents c2d433ec 493ecd5c

Documentation/kernel-parameters.txt

+7 −0
Original line number Diff line number Diff line
@@ -3932,6 +3932,13 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
	spia_pedr=

	spia_peddr=



	stack_guard_gap=	[MM]

			override the default stack gap protection. The value

			is in page units and it defines how many pages prior

			to (for stacks growing down) resp. after (for stacks

			growing up) the main stack are reserved for no other

			mapping. Default value is 256 pages.



	stacktrace	[FTRACE]

			Enabled the stack tracer on boot up.

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 33

SUBLEVEL = 34

EXTRAVERSION =

NAME = Roaring Lionus

arch/arc/mm/mmap.c

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr, 


		vma = find_vma(mm, addr);

		if (TASK_SIZE - len >= addr &&

		    (!vma || addr + len <= vma->vm_start))

		    (!vma || addr + len <= vm_start_gap(vma)))

			return addr;

	}

arch/arm/mm/mmap.c

+2 −2
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr, 


		vma = find_vma(mm, addr);

		if (TASK_SIZE - len >= addr &&

		    (!vma || addr + len <= vma->vm_start))

		    (!vma || addr + len <= vm_start_gap(vma)))

			return addr;

	}
@@ -140,7 +140,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, 
			addr = PAGE_ALIGN(addr);

		vma = find_vma(mm, addr);

		if (TASK_SIZE - len >= addr &&

				(!vma || addr + len <= vma->vm_start))

				(!vma || addr + len <= vm_start_gap(vma)))

			return addr;

	}

arch/frv/mm/elf-fdpic.c

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi 
		addr = PAGE_ALIGN(addr);

		vma = find_vma(current->mm, addr);

		if (TASK_SIZE - len >= addr &&

		    (!vma || addr + len <= vma->vm_start))

		    (!vma || addr + len <= vm_start_gap(vma)))

			goto success;

	}