linux.git/arch/um/include, branch v2.6.30 Linux kernel source tree Merge branch 'tracing/core-v2' into tracing-for-linus 2009-04-01T22:49:02+00:00 Ingo Molnar mingo@elte.hu 2009-04-01T19:54:19+00:00 8302294f43250dc337108c51882a6007f2b1e2e0 Conflicts: include/linux/slub_def.h lib/Kconfig.debug mm/slob.c mm/slub.c 
Conflicts:
	include/linux/slub_def.h
	lib/Kconfig.debug
	mm/slob.c
	mm/slub.c
uml: remove useless comments 2009-04-01T15:59:17+00:00 WANG Cong xiyou.wangcong@gmail.com 2009-03-31T22:23:41+00:00 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> 
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>
uml: convert network device to internal network device stats 2009-03-27T07:46:39+00:00 Stephen Hemminger shemminger@linux-foundation.org 2009-03-26T15:11:16+00:00 cfa8707aa65f7ec8ed2130937810b4fb05b40cfa Convert the UML network device to use internal network device stats. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net> 
Convert the UML network device to use internal network device stats.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
tracing: make CALLER_ADDRx overwriteable 2009-03-02T21:49:37+00:00 Uwe Kleine-Koenig u.kleine-koenig@pengutronix.de 2009-02-27T20:30:03+00:00 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> 
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 30742d5c2277c325fb0e9d2d817d55a19995fe8f 2009-01-06T01:41:45+00:00 Al Viro viro@ftp.linux.org.uk 2009-01-05T17:18:52+00:00 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> 
... 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/locking 2008-10-28T15:54:49+00:00 Ingo Molnar mingo@elte.hu 2008-10-28T15:54:49+00:00 d1a76187a5be4f89c6cb19d800cb5fb7aac735c5 Conflicts: arch/um/include/asm/system.h 
Conflicts:
	arch/um/include/asm/system.h
x86, um: get rid of uml-config.h 2008-10-23T05:55:23+00:00 Al Viro viro@zeniv.linux.org.uk 2008-10-11T22:39:18+00:00 87e299e5c7508a9443f04703f1d0c7f518f79ea9 Take a few symbols we need into kern_constants.h Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: H. Peter Anvin <hpa@zytor.com> 
Take a few symbols we need into kern_constants.h

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
x86, um: get rid of arch/um/os symlink 2008-10-23T05:55:22+00:00 Al Viro viro@zeniv.linux.org.uk 2008-08-25T08:14:29+00:00 ec82c32d45644998a28abad0a6a9ccdd721a054e we can get DEV_NULL defined for arch/um/drivers/null.c in less convoluted ways, TYVM... Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: H. Peter Anvin <hpa@zytor.com> 
we can get DEV_NULL defined for arch/um/drivers/null.c in less
convoluted ways, TYVM...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
x86, um: get rid of excessive includes of uml-config.h 2008-10-23T05:55:22+00:00 Al Viro viro@zeniv.linux.org.uk 2008-08-25T08:12:10+00:00 887c57d480ee9dbfec53f2539359dd289f50acab Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: H. Peter Anvin <hpa@zytor.com> 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
x86, um: get rid of header symlinks 2008-10-23T05:55:22+00:00 Al Viro viro@zeniv.linux.org.uk 2008-08-23T21:28:20+00:00 aa7bd942498512d6b77d1d0da846a8ecdd5d6186 Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: H. Peter Anvin <hpa@zytor.com> 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>