Merge commit 'v2.6.28-rc2' into tracing/urgent

diff --cc Makefile
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/powerpc/Kconfig
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/include/asm/ftrace.h
index 0000000,47f7e65..9e8bc29
mode 000000,100644..100644
--- /dev/null
--- 2/arch/x86/include/asm/ftrace.h
+++ b/arch/x86/include/asm/ftrace.h
@@@ -1,0 -1,24 +1,24 @@@
 -#ifdef CONFIG_FTRACE
+ #ifndef _ASM_X86_FTRACE_H
+ #define _ASM_X86_FTRACE_H
+ 
 -#endif /* CONFIG_FTRACE */
++#ifdef CONFIG_FUNCTION_TRACER
+ #define MCOUNT_ADDR           ((long)(mcount))
+ #define MCOUNT_INSN_SIZE      5 /* sizeof mcount call */
+ 
+ #ifndef __ASSEMBLY__
+ extern void mcount(void);
+ 
+ static inline unsigned long ftrace_call_adjust(unsigned long addr)
+ {
+       /*
+        * call mcount is "e8 <4 byte offset>"
+        * The addr points to the 4 byte offset and the caller of this
+        * function wants the pointer to e8. Simply subtract one.
+        */
+       return addr - 1;
+ }
+ #endif
+ 
++#endif /* CONFIG_FUNCTION_TRACER */
+ 
+ #endif /* _ASM_X86_FTRACE_H */

diff --cc arch/x86/kernel/entry_32.S
Simple merge

diff --cc kernel/sysctl.c
Simple merge