Commit e5eb2b22 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm 

Pull ARM fixes from Russell King:

 - fix nommu assignment build warning

 - fix -Wundef preprocessor warning

 - reduce __thumb2__ definitions for crypto files that require it

* tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: 9287/1: Reduce __thumb2__ definition to crypto files that require it
  ARM: 9284/1: include <asm/pgtable.h> from proc-macros.S to fix -Wundef warnings
  ARM: 9280/1: mm: fix warning on phys_addr_t to void pointer assignment
parents 9f4d0bd2 2f62847c

arch/arm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ AFLAGS_NOWARN :=$(call as-option,-Wa$(comma)-mno-warn-deprecated,-Wa$(comma)-W) 


ifeq ($(CONFIG_THUMB2_KERNEL),y)

CFLAGS_ISA	:=-Wa,-mimplicit-it=always $(AFLAGS_NOWARN)

AFLAGS_ISA	:=$(CFLAGS_ISA) -Wa$(comma)-mthumb -D__thumb2__=2

AFLAGS_ISA	:=$(CFLAGS_ISA) -Wa$(comma)-mthumb

CFLAGS_ISA	+=-mthumb

else

CFLAGS_ISA	:=$(call cc-option,-marm,) $(AFLAGS_NOWARN)

arch/arm/crypto/Makefile

+6 −1
Original line number Diff line number Diff line
@@ -53,7 +53,12 @@ $(obj)/%-core.S: $(src)/%-armv4.pl 


clean-files += poly1305-core.S sha256-core.S sha512-core.S



aflags-thumb2-$(CONFIG_THUMB2_KERNEL)  := -U__thumb2__ -D__thumb2__=1



AFLAGS_sha256-core.o += $(aflags-thumb2-y)

AFLAGS_sha512-core.o += $(aflags-thumb2-y)



# massage the perlasm code a bit so we only get the NEON routine if we need it

poly1305-aflags-$(CONFIG_CPU_V7) := -U__LINUX_ARM_ARCH__ -D__LINUX_ARM_ARCH__=5

poly1305-aflags-$(CONFIG_KERNEL_MODE_NEON) := -U__LINUX_ARM_ARCH__ -D__LINUX_ARM_ARCH__=7

AFLAGS_poly1305-core.o += $(poly1305-aflags-y)
 
AFLAGS_poly1305-core.o += $(poly1305-aflags-y) $(aflags-thumb2-y)

arch/arm/mm/nommu.c

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ void __init paging_init(const struct machine_desc *mdesc) 
	mpu_setup();



	/* allocate the zero page. */

	zero_page = memblock_alloc(PAGE_SIZE, PAGE_SIZE);

	zero_page = (void *)memblock_alloc(PAGE_SIZE, PAGE_SIZE);

	if (!zero_page)

		panic("%s: Failed to allocate %lu bytes align=0x%lx\n",

		      __func__, PAGE_SIZE, PAGE_SIZE);

arch/arm/mm/proc-macros.S

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

 */

#include <asm/asm-offsets.h>

#include <asm/pgtable.h>

#include <asm/thread_info.h>



#ifdef CONFIG_CPU_V7M