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

Commit 17eea0df authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

parents 9b905fe6 76e10d15

Makefile

+7 −4
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 4

SUBLEVEL = 0

EXTRAVERSION = -rc7

EXTRAVERSION =

NAME = Saber-toothed Squirrel



# *DOCUMENTATION*
@@ -442,7 +442,7 @@ asm-generic: 


no-dot-config-targets := clean mrproper distclean \

			 cscope gtags TAGS tags help %docs check% coccicheck \

			 include/linux/version.h headers_% archheaders \

			 include/linux/version.h headers_% archheaders archscripts \

			 kernelversion %src-pkg



config-targets := 0
@@ -979,7 +979,7 @@ prepare1: prepare2 include/linux/version.h include/generated/utsrelease.h \ 
                   include/config/auto.conf

	$(cmd_crmodverdir)



archprepare: archheaders prepare1 scripts_basic

archprepare: archheaders archscripts prepare1 scripts_basic



prepare0: archprepare FORCE

	$(Q)$(MAKE) $(build)=.
@@ -1049,8 +1049,11 @@ hdr-dst = $(if $(KBUILD_HEADERS), dst=include/asm-$(hdr-arch), dst=include/asm) 
PHONY += archheaders

archheaders:



PHONY += archscripts

archscripts:



PHONY += __headers

__headers: include/linux/version.h scripts_basic asm-generic archheaders FORCE

__headers: include/linux/version.h scripts_basic asm-generic archheaders archscripts FORCE

	$(Q)$(MAKE) $(build)=scripts build_unifdef



PHONY += headers_install_all

arch/arm/mach-prima2/irq.c

+4 −2
Original line number Diff line number Diff line
@@ -42,7 +42,8 @@ sirfsoc_alloc_gc(void __iomem *base, unsigned int irq_start, unsigned int num) 
static __init void sirfsoc_irq_init(void)

{

	sirfsoc_alloc_gc(sirfsoc_intc_base, 0, 32);

	sirfsoc_alloc_gc(sirfsoc_intc_base + 4, 32, SIRFSOC_INTENAL_IRQ_END - 32);

	sirfsoc_alloc_gc(sirfsoc_intc_base + 4, 32,

			SIRFSOC_INTENAL_IRQ_END + 1 - 32);



	writel_relaxed(0, sirfsoc_intc_base + SIRFSOC_INT_RISC_LEVEL0);

	writel_relaxed(0, sirfsoc_intc_base + SIRFSOC_INT_RISC_LEVEL1);
@@ -68,7 +69,8 @@ void __init sirfsoc_of_irq_init(void) 
	if (!sirfsoc_intc_base)

		panic("unable to map intc cpu registers\n");



	irq_domain_add_legacy(np, 32, 0, 0, &irq_domain_simple_ops, NULL);

	irq_domain_add_legacy(np, SIRFSOC_INTENAL_IRQ_END + 1, 0, 0,

		&irq_domain_simple_ops, NULL);



	of_node_put(np);

arch/arm/mach-tegra/flowctrl.c

+2 −2
Original line number Diff line number Diff line
@@ -53,10 +53,10 @@ static void flowctrl_update(u8 offset, u32 value) 


void flowctrl_write_cpu_csr(unsigned int cpuid, u32 value)

{

	return flowctrl_update(flowctrl_offset_halt_cpu[cpuid], value);

	return flowctrl_update(flowctrl_offset_cpu_csr[cpuid], value);

}



void flowctrl_write_cpu_halt(unsigned int cpuid, u32 value)

{

	return flowctrl_update(flowctrl_offset_cpu_csr[cpuid], value);

	return flowctrl_update(flowctrl_offset_halt_cpu[cpuid], value);

}

arch/arm/mm/fault.c

+3 −1
Original line number Diff line number Diff line
@@ -247,7 +247,9 @@ __do_page_fault(struct mm_struct *mm, unsigned long addr, unsigned int fsr, 
	return handle_mm_fault(mm, vma, addr & PAGE_MASK, flags);



check_stack:

	if (vma->vm_flags & VM_GROWSDOWN && !expand_stack(vma, addr))

	/* Don't allow expansion below FIRST_USER_ADDRESS */

	if (vma->vm_flags & VM_GROWSDOWN &&

	    addr >= FIRST_USER_ADDRESS && !expand_stack(vma, addr))

		goto good_area;

out:

	return fault;

arch/arm/mm/mmu.c

+2 −1
Original line number Diff line number Diff line
@@ -489,6 +489,7 @@ static void __init build_mem_type_table(void) 
	 */

	for (i = 0; i < ARRAY_SIZE(mem_types); i++) {

		mem_types[i].prot_pte |= PTE_EXT_AF;

		if (mem_types[i].prot_sect)

			mem_types[i].prot_sect |= PMD_SECT_AF;

	}

	kern_pgprot |= PTE_EXT_AF;