2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------ Commit: e1e10a265d28273ab8c70be19d43dcbdeead6c5a upstream Just a minor cleanup patch that makes things easier to the following patches. No functionality change in this patch. Signed-off-by: Venkatesh Pallipadi <[email protected]> Signed-off-by: Peter Zijlstra <[email protected]> Signed-off-by: Andi Kleen <[email protected]> LKML-Reference: <[email protected]> Signed-off-by: Ingo Molnar <[email protected]> Signed-off-by: Mike Galbraith <[email protected]> Acked-by: Peter Zijlstra <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> --- arch/ia64/include/asm/system.h | 4 ---- arch/powerpc/include/asm/system.h | 4 ---- arch/s390/include/asm/system.h | 1 - include/linux/hardirq.h | 2 ++ 4 files changed, 2 insertions(+), 9 deletions(-) Index: linux-2.6.35.y/arch/ia64/include/asm/system.h =================================================================== --- linux-2.6.35.y.orig/arch/ia64/include/asm/system.h 2011-03-29 22:51:30.768935869 -0700 +++ linux-2.6.35.y/arch/ia64/include/asm/system.h 2011-03-29 23:03:00.172295761 -0700 @@ -272,10 +272,6 @@ void default_idle(void); -#ifdef CONFIG_VIRT_CPU_ACCOUNTING -extern void account_system_vtime(struct task_struct *); -#endif - #endif /* __KERNEL__ */ #endif /* __ASSEMBLY__ */ Index: linux-2.6.35.y/arch/powerpc/include/asm/system.h =================================================================== --- linux-2.6.35.y.orig/arch/powerpc/include/asm/system.h 2011-03-29 22:51:30.768935869 -0700 +++ linux-2.6.35.y/arch/powerpc/include/asm/system.h 2011-03-29 23:03:00.172295761 -0700 @@ -545,10 +545,6 @@ #define PTRRELOC(x) ((typeof(x)) add_reloc_offset((unsigned long)(x))) -#ifdef CONFIG_VIRT_CPU_ACCOUNTING -extern void account_system_vtime(struct task_struct *); -#endif - extern struct dentry *powerpc_debugfs_root; #endif /* __KERNEL__ */ Index: linux-2.6.35.y/arch/s390/include/asm/system.h =================================================================== --- linux-2.6.35.y.orig/arch/s390/include/asm/system.h 2011-03-29 22:51:30.768935869 -0700 +++ linux-2.6.35.y/arch/s390/include/asm/system.h 2011-03-29 23:03:00.199295071 -0700 @@ -97,7 +97,6 @@ extern void account_vtime(struct task_struct *, struct task_struct *); extern void account_tick_vtime(struct task_struct *); -extern void account_system_vtime(struct task_struct *); #ifdef CONFIG_PFAULT extern void pfault_irq_init(void); Index: linux-2.6.35.y/include/linux/hardirq.h =================================================================== --- linux-2.6.35.y.orig/include/linux/hardirq.h 2011-03-29 23:03:00.144296478 -0700 +++ linux-2.6.35.y/include/linux/hardirq.h 2011-03-29 23:55:00.771447437 -0700 @@ -141,6 +141,8 @@ static inline void account_system_vtime(struct task_struct *tsk) { } +#else +extern void account_system_vtime(struct task_struct *tsk); #endif #if defined(CONFIG_NO_HZ) _______________________________________________ stable mailing list [email protected] http://linux.kernel.org/mailman/listinfo/stable
