Commit 4c2741ac authored by Russell King's avatar Russell King
Browse files

Merge branches 'fixes', 'misc' and 'smp-hotplug' into for-next

parents d410a8a4 9db043d3 6213f70e

Documentation/arm/kernel_mode_neon.txt

+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ TL;DR summary 
* Use only NEON instructions, or VFP instructions that don't rely on support

  code

* Isolate your NEON code in a separate compilation unit, and compile it with

  '-mfpu=neon -mfloat-abi=softfp'

  '-march=armv7-a -mfpu=neon -mfloat-abi=softfp'

* Put kernel_neon_begin() and kernel_neon_end() calls around the calls into your

  NEON code

* Don't sleep in your NEON code, and be aware that it will be executed with
@@ -87,7 +87,7 @@ instructions appearing in unexpected places if no special care is taken. 
Therefore, the recommended and only supported way of using NEON/VFP in the

kernel is by adhering to the following rules:

* isolate the NEON code in a separate compilation unit and compile it with

  '-mfpu=neon -mfloat-abi=softfp';

  '-march=armv7-a -mfpu=neon -mfloat-abi=softfp';

* issue the calls to kernel_neon_begin(), kernel_neon_end() as well as the calls

  into the unit containing the NEON code from a compilation unit which is *not*

  built with the GCC flag '-mfpu=neon' set.

arch/arm/Kconfig

+1 −2
Original line number Diff line number Diff line
@@ -1304,7 +1304,7 @@ config SCHED_SMT 
config HAVE_ARM_SCU

	bool

	help

	  This option enables support for the ARM system coherency unit

	  This option enables support for the ARM snoop control unit



config HAVE_ARM_ARCH_TIMER

	bool "Architected timer support"
@@ -1316,7 +1316,6 @@ config HAVE_ARM_ARCH_TIMER 


config HAVE_ARM_TWD

	bool

	select TIMER_OF if OF

	help

	  This options enables support for the ARM timer and watchdog unit

arch/arm/Kconfig-nommu

+2 −0
Original line number Diff line number Diff line
@@ -20,10 +20,12 @@ config DRAM_SIZE 


config FLASH_MEM_BASE

	hex 'FLASH Base Address' if SET_MEM_PARAM

	depends on CPU_ARM740T || CPU_ARM946E || CPU_ARM940T

	default 0x00400000



config FLASH_SIZE

	hex 'FLASH Size' if SET_MEM_PARAM

	depends on CPU_ARM740T || CPU_ARM946E || CPU_ARM940T

	default 0x00400000



config PROCESSOR_ID

arch/arm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#

# Copyright (C) 1995-2001 by Russell King



LDFLAGS_vmlinux	:=-p --no-undefined -X --pic-veneer

LDFLAGS_vmlinux	:= --no-undefined -X --pic-veneer

ifeq ($(CONFIG_CPU_ENDIAN_BE8),y)

LDFLAGS_vmlinux	+= --be8

KBUILD_LDFLAGS_MODULE	+= --be8

arch/arm/boot/bootp/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 


GCOV_PROFILE	:= n



LDFLAGS_bootp	:=-p --no-undefined -X \

LDFLAGS_bootp	:= --no-undefined -X \

		 --defsym initrd_phys=$(INITRD_PHYS) \

		 --defsym params_phys=$(PARAMS_PHYS) -T

AFLAGS_initrd.o :=-DINITRD=\"$(INITRD)\"

CRA Git | Maintained and supported by SUSTech CRA and CCSE