tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Pull ARM fixes from Russell King:

- Fix early_iounmap

- Drop cc-option fallbacks for architecture selection

* tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
ARM: 9156/1: drop cc-option fallbacks for architecture selection
ARM: 9155/1: fix early early_iounmap()

Linus Torvalds 6ea45c57 0d1503d8

+13 -13
+11 -11
arch/arm/Makefile
··· 60 60 # Note that GCC does not numerically define an architecture version 61 61 # macro, but instead defines a whole series of macros which makes 62 62 # testing for a specific architecture or later rather impossible. 63 - arch-$(CONFIG_CPU_32v7M) =-D__LINUX_ARM_ARCH__=7 -march=armv7-m -Wa,-march=armv7-m 64 - arch-$(CONFIG_CPU_32v7) =-D__LINUX_ARM_ARCH__=7 $(call cc-option,-march=armv7-a,-march=armv5t -Wa$(comma)-march=armv7-a) 65 - arch-$(CONFIG_CPU_32v6) =-D__LINUX_ARM_ARCH__=6 $(call cc-option,-march=armv6,-march=armv5t -Wa$(comma)-march=armv6) 63 + arch-$(CONFIG_CPU_32v7M) =-D__LINUX_ARM_ARCH__=7 -march=armv7-m 64 + arch-$(CONFIG_CPU_32v7) =-D__LINUX_ARM_ARCH__=7 -march=armv7-a 65 + arch-$(CONFIG_CPU_32v6) =-D__LINUX_ARM_ARCH__=6 -march=armv6 66 66 # Only override the compiler option if ARMv6. The ARMv6K extensions are 67 67 # always available in ARMv7 68 68 ifeq ($(CONFIG_CPU_32v6),y) 69 - arch-$(CONFIG_CPU_32v6K) =-D__LINUX_ARM_ARCH__=6 $(call cc-option,-march=armv6k,-march=armv5t -Wa$(comma)-march=armv6k) 69 + arch-$(CONFIG_CPU_32v6K) =-D__LINUX_ARM_ARCH__=6 -march=armv6k 70 70 endif 71 - arch-$(CONFIG_CPU_32v5) =-D__LINUX_ARM_ARCH__=5 $(call cc-option,-march=armv5te,-march=armv4t) 71 + arch-$(CONFIG_CPU_32v5) =-D__LINUX_ARM_ARCH__=5 -march=armv5te 72 72 arch-$(CONFIG_CPU_32v4T) =-D__LINUX_ARM_ARCH__=4 -march=armv4t 73 73 arch-$(CONFIG_CPU_32v4) =-D__LINUX_ARM_ARCH__=4 -march=armv4 74 74 arch-$(CONFIG_CPU_32v3) =-D__LINUX_ARM_ARCH__=3 -march=armv3m ··· 82 82 tune-$(CONFIG_CPU_ARM740T) =-mtune=arm7tdmi 83 83 tune-$(CONFIG_CPU_ARM9TDMI) =-mtune=arm9tdmi 84 84 tune-$(CONFIG_CPU_ARM940T) =-mtune=arm9tdmi 85 - tune-$(CONFIG_CPU_ARM946E) =$(call cc-option,-mtune=arm9e,-mtune=arm9tdmi) 85 + tune-$(CONFIG_CPU_ARM946E) =-mtune=arm9e 86 86 tune-$(CONFIG_CPU_ARM920T) =-mtune=arm9tdmi 87 87 tune-$(CONFIG_CPU_ARM922T) =-mtune=arm9tdmi 88 88 tune-$(CONFIG_CPU_ARM925T) =-mtune=arm9tdmi ··· 90 90 tune-$(CONFIG_CPU_FA526) =-mtune=arm9tdmi 91 91 tune-$(CONFIG_CPU_SA110) =-mtune=strongarm110 92 92 tune-$(CONFIG_CPU_SA1100) =-mtune=strongarm1100 93 - tune-$(CONFIG_CPU_XSCALE) =$(call cc-option,-mtune=xscale,-mtune=strongarm110) -Wa,-mcpu=xscale 94 - tune-$(CONFIG_CPU_XSC3) =$(call cc-option,-mtune=xscale,-mtune=strongarm110) -Wa,-mcpu=xscale 95 - tune-$(CONFIG_CPU_FEROCEON) =$(call cc-option,-mtune=marvell-f,-mtune=xscale) 96 - tune-$(CONFIG_CPU_V6) =$(call cc-option,-mtune=arm1136j-s,-mtune=strongarm) 97 - tune-$(CONFIG_CPU_V6K) =$(call cc-option,-mtune=arm1136j-s,-mtune=strongarm) 93 + tune-$(CONFIG_CPU_XSCALE) =-mtune=xscale 94 + tune-$(CONFIG_CPU_XSC3) =-mtune=xscale 95 + tune-$(CONFIG_CPU_FEROCEON) =-mtune=xscale 96 + tune-$(CONFIG_CPU_V6) =-mtune=arm1136j-s 97 + tune-$(CONFIG_CPU_V6K) =-mtune=arm1136j-s 98 98 99 99 # Evaluate tune cc-option calls now 100 100 tune-y := $(tune-y)
+2 -2
arch/arm/mm/mmu.c
··· 390 390 BUILD_BUG_ON(__fix_to_virt(__end_of_fixed_addresses) < FIXADDR_START); 391 391 BUG_ON(idx >= __end_of_fixed_addresses); 392 392 393 - /* we only support device mappings until pgprot_kernel has been set */ 393 + /* We support only device mappings before pgprot_kernel is set. */ 394 394 if (WARN_ON(pgprot_val(prot) != pgprot_val(FIXMAP_PAGE_IO) && 395 - pgprot_val(pgprot_kernel) == 0)) 395 + pgprot_val(prot) && pgprot_val(pgprot_kernel) == 0)) 396 396 return; 397 397 398 398 if (pgprot_val(prot))