kernel.git/arch/um/include/asm, branch linux-2.6.30.yHosts the 0x221E linux distro kernel.
https://git.0xinfinity.dev/distro/kernel.git/atom?h=linux-2.6.30.y2009-04-01T22:49:02ZMerge branch 'tracing/core-v2' into tracing-for-linus2009-04-01T22:49:02ZIngo Molnar2009-04-01T19:54:19Zurn:sha1:8302294f43250dc337108c51882a6007f2b1e2e0
Conflicts:
include/linux/slub_def.h
lib/Kconfig.debug
mm/slob.c
mm/slub.c
uml: remove useless comments2009-04-01T15:59:17ZWANG Cong2009-03-31T22:23:41Zurn:sha1:65bd6a9bc7be3f5841dad12f77ce4b3210bd82c5
These comments are useless now, remove them.
Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
tracing: make CALLER_ADDRx overwriteable2009-03-02T21:49:37ZUwe Kleine-Koenig2009-02-27T20:30:03Zurn:sha1:c79a61f55773d2519fd0525bf58385f7d20752d3
The current definition of CALLER_ADDRx isn't suitable for all platforms.
E.g. for ARM __builtin_return_address(N) doesn't work for N > 0 and
AFAIK for powerpc there are no frame pointers needed to have a working
__builtin_return_address. This patch allows defining the CALLER_ADDRx
macros in <asm/ftrace.h> and let these take precedence.
Because now <asm/ftrace.h> is included unconditionally in
<linux/ftrace.h> all archs that don't already had this include get an
empty one for free.
Signed-off-by: Uwe Kleine-Koenig <u.kleine-koenig@pengutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@elte.hu>
Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Signed-off-by: Steven Rostedt <srostedt@redhat.com>
uml got broken by commit 30742d5c2277c325fb0e9d2d817d55a19995fe8f2009-01-06T01:41:45ZAl Viro2009-01-05T17:18:52Zurn:sha1:7483cb7bbc02b9471dda28e54f41287d5374e3ac
... if you revert a commit, revert the fixups elsewhere that had been
triggered by it. Such as 8c56250f48347750c82ab18d98d647dcf99ca674
(lockdep, UML: fix compilation when CONFIG_TRACE_IRQFLAGS_SUPPORT is not set).
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Merge commit 'v2.6.28-rc2' into core/locking2008-10-28T15:54:49ZIngo Molnar2008-10-28T15:54:49Zurn:sha1:d1a76187a5be4f89c6cb19d800cb5fb7aac735c5
Conflicts:
arch/um/include/asm/system.h
x86, um: get rid of header symlinks2008-10-23T05:55:22ZAl Viro2008-08-23T21:28:20Zurn:sha1:aa7bd942498512d6b77d1d0da846a8ecdd5d6186
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
x86, um: trim the junk from uml ptrace-*.h2008-10-23T05:55:21ZAl Viro2008-08-18T21:47:45Zurn:sha1:17dcf75d3ea11d7e26110ba85677cfadbccecf45
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
x86, um: take vm-flags.h to sysdep2008-10-23T05:55:21ZAl Viro2008-08-18T14:20:37Zurn:sha1:2985cfdb04002b8e4c003a4008b2580aaebf75fc
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
x86, um: get rid of uml asm/arch2008-10-23T05:55:21ZAl Viro2008-08-18T08:54:36Zurn:sha1:6b0eed4ef3d024c3a709fbc3bb45ee5b0ac8486d
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
x86, um: get rid of uml highmem.h2008-10-23T05:55:21ZAl Viro2008-08-18T08:15:12Zurn:sha1:fe1cd9876fa6250a8eb3ae138917a2040eca2c47
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>