summaryrefslogtreecommitdiffstats
path: root/arch/mips/include/asm/ftrace.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-02-28 19:04:02 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2010-02-28 19:04:02 +0100
commitf91b22c35f6b0ae06ec5b67922eca1999c3b6e0a (patch)
treeb9a87ce1bf41e3b7535c7feddbf402b9380090aa /arch/mips/include/asm/ftrace.h
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gee... (diff)
parentgeneric-ipi: Optimize accesses by using DEFINE_PER_CPU_SHARED_ALIGNED for IPI... (diff)
parentplist: Fix grammar mistake, and c-style mistake (diff)
parentkprobes: Add mcount to the kprobes blacklist (diff)
parentx86_64: Print modules like i386 does (diff)
parentx86: Put 'nopat' in kernel-parameters (diff)
parentx86-64: Allow fbdev primary video code (diff)
parentx86: Use helpers for rlimits (diff)
downloadlinux-f91b22c35f6b0ae06ec5b67922eca1999c3b6e0a.tar.xz
linux-f91b22c35f6b0ae06ec5b67922eca1999c3b6e0a.zip
Merge branches 'core-ipi-for-linus', 'core-locking-for-linus', 'tracing-fixes-for-linus', 'x86-debug-for-linus', 'x86-doc-for-linus', 'x86-gpu-for-linus' and 'x86-rlimit-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-ipi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: generic-ipi: Optimize accesses by using DEFINE_PER_CPU_SHARED_ALIGNED for IPI data * 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: plist: Fix grammar mistake, and c-style mistake * 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: kprobes: Add mcount to the kprobes blacklist * 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86_64: Print modules like i386 does * 'x86-doc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: Put 'nopat' in kernel-parameters * 'x86-gpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86-64: Allow fbdev primary video code * 'x86-rlimit-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: Use helpers for rlimits