Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+9
-3
+1
-1
arch/arm/Makefile
+1
-1
arch/arm/Makefile
···
132
132
133
133
ifeq ($(CONFIG_THUMB2_KERNEL),y)
134
134
CFLAGS_ISA :=-Wa,-mimplicit-it=always $(AFLAGS_NOWARN)
135
-
AFLAGS_ISA :=$(CFLAGS_ISA) -Wa$(comma)-mthumb -D__thumb2__=2
135
+
AFLAGS_ISA :=$(CFLAGS_ISA) -Wa$(comma)-mthumb
136
136
CFLAGS_ISA +=-mthumb
137
137
else
138
138
CFLAGS_ISA :=$(call cc-option,-marm,) $(AFLAGS_NOWARN)
+6
-1
arch/arm/crypto/Makefile
+6
-1
arch/arm/crypto/Makefile
···
53
53
54
54
clean-files += poly1305-core.S sha256-core.S sha512-core.S
55
55
56
+
aflags-thumb2-$(CONFIG_THUMB2_KERNEL) := -U__thumb2__ -D__thumb2__=1
57
+
58
+
AFLAGS_sha256-core.o += $(aflags-thumb2-y)
59
+
AFLAGS_sha512-core.o += $(aflags-thumb2-y)
60
+
56
61
# massage the perlasm code a bit so we only get the NEON routine if we need it
57
62
poly1305-aflags-$(CONFIG_CPU_V7) := -U__LINUX_ARM_ARCH__ -D__LINUX_ARM_ARCH__=5
58
63
poly1305-aflags-$(CONFIG_KERNEL_MODE_NEON) := -U__LINUX_ARM_ARCH__ -D__LINUX_ARM_ARCH__=7
59
-
AFLAGS_poly1305-core.o += $(poly1305-aflags-y)
64
+
AFLAGS_poly1305-core.o += $(poly1305-aflags-y) $(aflags-thumb2-y)
+1
-1
arch/arm/mm/nommu.c
+1
-1
arch/arm/mm/nommu.c
···
161
161
mpu_setup();
162
162
163
163
/* allocate the zero page. */
164
-
zero_page = memblock_alloc(PAGE_SIZE, PAGE_SIZE);
164
+
zero_page = (void *)memblock_alloc(PAGE_SIZE, PAGE_SIZE);
165
165
if (!zero_page)
166
166
panic("%s: Failed to allocate %lu bytes align=0x%lx\n",
167
167
__func__, PAGE_SIZE, PAGE_SIZE);