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

Commit 828aac2e authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branch 'for-rmk' of git://git.pengutronix.de/git/ukl/linux-2.6 into devel

parents 6fd7c7fe 7971db5a

arch/arm/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -156,7 +156,6 @@ config ARCH_MTD_XIP 
	bool



config GENERIC_HARDIRQS_NO__DO_IRQ

	bool

	def_bool y



if OPROFILE
@@ -288,6 +287,8 @@ config ARCH_NETX 
	bool "Hilscher NetX based"

	select CPU_ARM926T

	select ARM_VIC

	select GENERIC_CLOCKEVENTS

	select GENERIC_TIME

	help

	  This enables support for systems based on the Hilscher NetX Soc

arch/arm/configs/netx_defconfig

+3 −3
Original line number Diff line number Diff line
@@ -728,9 +728,9 @@ CONFIG_RTC_CLASS=m 
#

# RTC interfaces

#

CONFIG_RTC_INTF_SYSFS=m

CONFIG_RTC_INTF_PROC=m

CONFIG_RTC_INTF_DEV=m

CONFIG_RTC_INTF_SYSFS=y

CONFIG_RTC_INTF_PROC=y

CONFIG_RTC_INTF_DEV=y



#

# RTC drivers

arch/arm/configs/picotux200_defconfig

+3 −3
Original line number Diff line number Diff line
@@ -1069,9 +1069,9 @@ CONFIG_RTC_CLASS=m 
#

# RTC interfaces

#

CONFIG_RTC_INTF_SYSFS=m

CONFIG_RTC_INTF_PROC=m

CONFIG_RTC_INTF_DEV=m

CONFIG_RTC_INTF_SYSFS=y

CONFIG_RTC_INTF_PROC=y

CONFIG_RTC_INTF_DEV=y

# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set



#

arch/arm/kernel/ftrace.c

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ int ftrace_update_ftrace_func(ftrace_func_t func) 
	return ret;

}



/* run from kstop_machine */

/* run from ftrace_init with irqs disabled */

int __init ftrace_dyn_arch_init(void *data)

{

	ftrace_mcount_set(data);

arch/arm/mach-at91/at91rm9200_time.c

+9 −0
Original line number Diff line number Diff line
@@ -141,6 +141,15 @@ clkevt32k_next_event(unsigned long delta, struct clock_event_device *dev) 
	/* Use "raw" primitives so we behave correctly on RT kernels. */

	raw_local_irq_save(flags);



	/*

	 * According to Thomas Gleixner irqs are already disabled here.  Simply

	 * removing raw_local_irq_save above (and the matching

	 * raw_local_irq_restore) was not accepted.  See

	 * http://thread.gmane.org/gmane.linux.ports.arm.kernel/41174

	 * So for now (2008-11-20) just warn once if irqs were not disabled ...

	 */

	WARN_ON_ONCE(!raw_irqs_disabled_flags(flags));



	/* The alarm IRQ uses absolute time (now+delta), not the relative

	 * time (delta) in our calling convention.  Like all clockevents

	 * using such "match" hardware, we have a race to defend against.