Merge branch 'for-rmk-realview' of git://linux-arm.org/linux-2.6 into devel (657e1de8) · Commits · e / devices / android_kernel_xiaomi_nabu

arch/arm/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -804,7 +804,7 @@ config HOTPLUG_CPU

		config LOCAL_TIMERS
		bool "Use local timer interrupts"
		depends on SMP && (REALVIEW_EB_ARM11MP \|\| MACH_REALVIEW_PB11MP)
		depends on SMP && (REALVIEW_EB_ARM11MP \|\| MACH_REALVIEW_PB11MP \|\| REALVIEW_EB_A9MP)
		default y
		help
		Enable support for local timers on SMP platforms, rather then the

+401 −317

File changed.

Preview size limit exceeded, changes collapsed.

+524 −239

File changed.

Preview size limit exceeded, changes collapsed.

+3 −3

Original line number	Diff line number	Diff line
		@@ -114,7 +114,7 @@ extern void local_timer_interrupt(void);
		/*
		* Stop a local timer interrupt.
		*/
		extern void local_timer_stop(unsigned int cpu);
		extern void local_timer_stop(void);

		/*
		* Platform provides this to acknowledge a local timer IRQ
		@@ -123,7 +123,7 @@ extern int local_timer_ack(void);

		#else

		static inline void local_timer_stop(unsigned int cpu)
		static inline void local_timer_stop(void)
		{
		}

		@@ -132,7 +132,7 @@ static inline void local_timer_stop(unsigned int cpu)
		/*
		* Setup a local timer interrupt for a CPU.
		*/
		extern void local_timer_setup(unsigned int cpu);
		extern void local_timer_setup(void);

		/*
		* show local interrupt info

+2 −2

Original line number	Diff line number	Diff line
		@@ -181,7 +181,7 @@ int __cpuexit __cpu_disable(void)
		/*
		* Stop the local timer for this CPU.
		*/
		local_timer_stop(cpu);
		local_timer_stop();

		/*
		* Flush user cache and TLB mappings, and then remove this CPU
		@@ -284,7 +284,7 @@ asmlinkage void __cpuinit secondary_start_kernel(void)
		/*
		* Setup local timer for this CPU.
		*/
		local_timer_setup(cpu);
		local_timer_setup();

		calibrate_delay();