linux-toradex.git/arch/um/include/asm/system.h, branch v2.6.32 Linux kernel for Apalis and Colibri modules 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 system.h -> system.h include 2008-10-23T05:55:21+00:00 Al Viro viro@zeniv.linux.org.uk 2008-08-18T07:25:24+00:00 6a0eec8224db1191876770f7cac31f2a2637a6f5 Long-term we want to split system.h and include barriers part from underlying target; for now copy that part to sysdep. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: H. Peter Anvin <hpa@zytor.com> 
Long-term we want to split system.h and include barriers part from
underlying target; for now copy that part to sysdep.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>