Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm 

* 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm:
  ARM: 6879/1: fix personality test wrt usage of domain handlers
  ARM: 6878/1: fix personality flag propagation across an exec
  ARM: 6877/1: the ADDR_NO_RANDOMIZE personality flag should be honored with mmap()
  ARM: 6876/1: Kconfig.debug: Remove unused CONFIG_DEBUG_ERRORS
  ARM: pxa: convert incorrect IRQ_TO_IRQ() to irq_to_gpio()
  ARM: mmp: align NR_BUILTIN_GPIO with gpio interrupt number
  ARM: pxa: align NR_BUILTIN_GPIO with GPIO interrupt number
  ARM: pxa: always clear LPM bits for PXA168 MFPR
  pcmcia: limit pxa2xx_trizeps4 subdriver to trizeps4 platform
  pcmcia: limit pxa2xx_balloon3 subdriver to balloon3 platform
  ARM: pxafb: Fix access to nonexistent member of pxafb_info
  ARM: 6872/1: arch:common:Makefile Remove unused config in the Makefile.
  ARM: 6868/1: Preserve the VFP state during fork
  ARM: 6867/1: Introduce THREAD_NOTIFY_COPY for copy_thread() hooks
  ARM: 6866/1: Do not restrict HIGHPTE to !OUTER_CACHE
  ARM: 6865/1: perf: ensure pass through zero is counted on overflow
  ARM: 6864/1: hw_breakpoint: clear DBGVCR out of reset
  ARM: Only allow PM_SLEEP with CPUs which support suspend
  ARM: Make consolidated PM sleep code depend on PM_SLEEP
parents c1530019 88b9ef45

arch/arm/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -1540,7 +1540,6 @@ config HIGHMEM 
config HIGHPTE

	bool "Allocate 2nd-level pagetables from highmem"

	depends on HIGHMEM

	depends on !OUTER_CACHE



config HW_PERF_EVENTS

	bool "Enable hardware performance counter support for perf events"
@@ -2012,6 +2011,8 @@ source "kernel/power/Kconfig" 


config ARCH_SUSPEND_POSSIBLE

	depends on !ARCH_S5P64X0 && !ARCH_S5P6442

	depends on CPU_ARM920T || CPU_ARM926T || CPU_SA1100 || \

		CPU_V6 || CPU_V6K || CPU_V7 || CPU_XSC3 || CPU_XSCALE

	def_bool y



endmenu

arch/arm/Kconfig.debug

+0 −11
Original line number Diff line number Diff line
@@ -63,17 +63,6 @@ config DEBUG_USER 
	      8 - SIGSEGV faults

	     16 - SIGBUS faults



config DEBUG_ERRORS

	bool "Verbose kernel error messages"

	depends on DEBUG_KERNEL

	help

	  This option controls verbose debugging information which can be

	  printed when the kernel detects an internal error. This debugging

	  information is useful to kernel hackers when tracking down problems,

	  but mostly meaningless to other people. It's safe to say Y unless

	  you are concerned with the code size or don't want to see these

	  messages.



config DEBUG_STACK_USAGE

	bool "Enable stack utilization instrumentation"

	depends on DEBUG_KERNEL

arch/arm/common/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -16,5 +16,4 @@ obj-$(CONFIG_SHARP_SCOOP) += scoop.o 
obj-$(CONFIG_ARCH_IXP2000)	+= uengine.o

obj-$(CONFIG_ARCH_IXP23XX)	+= uengine.o

obj-$(CONFIG_PCI_HOST_ITE8152)  += it8152.o

obj-$(CONFIG_COMMON_CLKDEV)	+= clkdev.o

obj-$(CONFIG_ARM_TIMER_SP804)	+= timer-sp.o

arch/arm/include/asm/thread_notify.h

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ static inline void thread_notify(unsigned long rc, struct thread_info *thread) 
#define THREAD_NOTIFY_FLUSH	0

#define THREAD_NOTIFY_EXIT	1

#define THREAD_NOTIFY_SWITCH	2

#define THREAD_NOTIFY_COPY	3



#endif

#endif

arch/arm/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ obj-$(CONFIG_MODULES) += armksyms.o module.o 
obj-$(CONFIG_ARTHUR)		+= arthur.o

obj-$(CONFIG_ISA_DMA)		+= dma-isa.o

obj-$(CONFIG_PCI)		+= bios32.o isa.o

obj-$(CONFIG_PM)		+= sleep.o

obj-$(CONFIG_PM_SLEEP)		+= sleep.o

obj-$(CONFIG_HAVE_SCHED_CLOCK)	+= sched_clock.o

obj-$(CONFIG_SMP)		+= smp.o smp_tlb.o

obj-$(CONFIG_HAVE_ARM_SCU)	+= smp_scu.o