Commit 6bb1e381 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm 

Pull ARM fixes from Russell King:
 "A random collection of various fixes, mainly from Arnd and a few other
  people.  Not thing really stands out here."

* 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
  ARM: drop experimental status for hotplug and Thumb2
  ARM: 7560/1: SMP_TWD: use DIV_ROUND_CLOSEST() for periodic mode
  ARM: 7559/1: smp: switch away from the idmap before updating init_mm.mm_count
  ARM: 7556/1: perf: fix updated event period in response to PERF_EVENT_IOC_PERIOD
  ARM: 7555/1: kexec: fix segment memory addresses check
  ARM: warnings in arch/arm/include/asm/uaccess.h
  ARM: binfmt_flat: unused variable 'persistent'
  ARM: be really quiet when building with 'make -s'
  ARM: pass -marm to gcc by default for both C and assembler
  ARM: Xen: fix initial build problems
  ARM: export default read_current_timer
  ARM: Fix another build warning in arch/arm/mm/alignment.c
  ARM: export set_irq_flags
  ARM: kprobes: make more tests conditional
parents cff7b8ba b43b1ffa

arch/arm/Kconfig

+5 −4
Original line number Diff line number Diff line
@@ -1603,8 +1603,8 @@ config NR_CPUS 
	default "4"



config HOTPLUG_CPU

	bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"

	depends on SMP && HOTPLUG && EXPERIMENTAL

	bool "Support for hot-pluggable CPUs"

	depends on SMP && HOTPLUG

	help

	  Say Y here to experiment with turning CPUs off and on.  CPUs

	  can be controlled through /sys/devices/system/cpu.
@@ -1645,8 +1645,8 @@ config HZ 
	default 100



config THUMB2_KERNEL

	bool "Compile the kernel in Thumb-2 mode (EXPERIMENTAL)"

	depends on CPU_V7 && !CPU_V6 && !CPU_V6K && EXPERIMENTAL

	bool "Compile the kernel in Thumb-2 mode"

	depends on CPU_V7 && !CPU_V6 && !CPU_V6K

	select AEABI

	select ARM_ASM_UNIFIED

	select ARM_UNWIND
@@ -1850,6 +1850,7 @@ config XEN_DOM0 
config XEN

	bool "Xen guest support on ARM (EXPERIMENTAL)"

	depends on EXPERIMENTAL && ARM && OF

	depends on CPU_V7 && !CPU_V6

	help

	  Say Y if you want to run Linux in a Virtual Machine on Xen on ARM.

arch/arm/Makefile

+7 −6
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ endif 
OBJCOPYFLAGS	:=-O binary -R .comment -S

GZFLAGS		:=-9

#KBUILD_CFLAGS	+=-pipe

# Explicitly specifiy 32-bit ARM ISA since toolchain default can be -mthumb:

KBUILD_CFLAGS	+=$(call cc-option,-marm,)



# Never generate .eh_frame

KBUILD_CFLAGS	+= $(call cc-option,-fno-dwarf2-cfi-asm)
@@ -105,17 +103,20 @@ endif 
ifeq ($(CONFIG_THUMB2_KERNEL),y)

AFLAGS_AUTOIT	:=$(call as-option,-Wa$(comma)-mimplicit-it=always,-Wa$(comma)-mauto-it)

AFLAGS_NOWARN	:=$(call as-option,-Wa$(comma)-mno-warn-deprecated,-Wa$(comma)-W)

CFLAGS_THUMB2	:=-mthumb $(AFLAGS_AUTOIT) $(AFLAGS_NOWARN)

AFLAGS_THUMB2	:=$(CFLAGS_THUMB2) -Wa$(comma)-mthumb

CFLAGS_ISA	:=-mthumb $(AFLAGS_AUTOIT) $(AFLAGS_NOWARN)

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

# Work around buggy relocation from gas if requested:

ifeq ($(CONFIG_THUMB2_AVOID_R_ARM_THM_JUMP11),y)

CFLAGS_MODULE	+=-fno-optimize-sibling-calls

endif

else

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

AFLAGS_ISA	:=$(CFLAGS_ISA)

endif



# Need -Uarm for gcc < 3.x

KBUILD_CFLAGS	+=$(CFLAGS_ABI) $(CFLAGS_THUMB2) $(arch-y) $(tune-y) $(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,)) -msoft-float -Uarm

KBUILD_AFLAGS	+=$(CFLAGS_ABI) $(AFLAGS_THUMB2) $(arch-y) $(tune-y) -include asm/unified.h -msoft-float

KBUILD_CFLAGS	+=$(CFLAGS_ABI) $(CFLAGS_ISA) $(arch-y) $(tune-y) $(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,)) -msoft-float -Uarm

KBUILD_AFLAGS	+=$(CFLAGS_ABI) $(AFLAGS_ISA) $(arch-y) $(tune-y) -include asm/unified.h -msoft-float



CHECKFLAGS	+= -D__arm__

arch/arm/boot/Makefile

+5 −5
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ ifeq ($(CONFIG_XIP_KERNEL),y) 


$(obj)/xipImage: vmlinux FORCE

	$(call if_changed,objcopy)

	@echo '  Kernel: $@ is ready (physical address: $(CONFIG_XIP_PHYS_ADDR))'

	$(kecho) '  Kernel: $@ is ready (physical address: $(CONFIG_XIP_PHYS_ADDR))'



$(obj)/Image $(obj)/zImage: FORCE

	@echo 'Kernel configured for XIP (CONFIG_XIP_KERNEL=y)'
@@ -48,14 +48,14 @@ $(obj)/xipImage: FORCE 


$(obj)/Image: vmlinux FORCE

	$(call if_changed,objcopy)

	@echo '  Kernel: $@ is ready'

	$(kecho) '  Kernel: $@ is ready'



$(obj)/compressed/vmlinux: $(obj)/Image FORCE

	$(Q)$(MAKE) $(build)=$(obj)/compressed $@



$(obj)/zImage:	$(obj)/compressed/vmlinux FORCE

	$(call if_changed,objcopy)

	@echo '  Kernel: $@ is ready'

	$(kecho) '  Kernel: $@ is ready'



endif
@@ -90,7 +90,7 @@ fi 
$(obj)/uImage:	$(obj)/zImage FORCE

	@$(check_for_multiple_loadaddr)

	$(call if_changed,uimage)

	@echo '  Image $@ is ready'

	$(kecho) '  Image $@ is ready'



$(obj)/bootp/bootp: $(obj)/zImage initrd FORCE

	$(Q)$(MAKE) $(build)=$(obj)/bootp $@
@@ -98,7 +98,7 @@ $(obj)/bootp/bootp: $(obj)/zImage initrd FORCE 


$(obj)/bootpImage: $(obj)/bootp/bootp FORCE

	$(call if_changed,objcopy)

	@echo '  Kernel: $@ is ready'

	$(kecho) '  Kernel: $@ is ready'



PHONY += initrd FORCE

initrd:

arch/arm/include/asm/flat.h

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
#define	flat_argvp_envp_on_stack()		1

#define	flat_old_ram_flag(flags)		(flags)

#define	flat_reloc_valid(reloc, size)		((reloc) <= (size))

#define	flat_get_addr_from_rp(rp, relval, flags, persistent) get_unaligned(rp)

#define	flat_get_addr_from_rp(rp, relval, flags, persistent) ((void)persistent,get_unaligned(rp))

#define	flat_put_addr_at_rp(rp, val, relval)	put_unaligned(val,rp)

#define	flat_get_relocate_addr(rel)		(rel)

#define	flat_set_persistent(relval, p)		0

arch/arm/include/asm/uaccess.h

+2 −2
Original line number Diff line number Diff line
@@ -200,8 +200,8 @@ extern int __put_user_8(void *, unsigned long long); 
#define USER_DS			KERNEL_DS



#define segment_eq(a,b)		(1)

#define __addr_ok(addr)		(1)

#define __range_ok(addr,size)	(0)

#define __addr_ok(addr)		((void)(addr),1)

#define __range_ok(addr,size)	((void)(addr),0)

#define get_fs()		(KERNEL_DS)



static inline void set_fs(mm_segment_t fs)

CRA Git | Maintained and supported by SUSTech CRA and CCSE