linux

Author SHA1 Message Date

Author	SHA1	Message	Date
Al Viro	7483cb7bbc	uml got broken by commit `30742d5c22` ... if you revert a commit, revert the fixups elsewhere that had been triggered by it. Such as `8c56250f48` (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>	2009-01-05 17:41:45 -08:00
Ingo Molnar	d1a76187a5	Merge commit 'v2.6.28-rc2' into core/locking Conflicts: arch/um/include/asm/system.h	2008-10-28 16:54:49 +01:00
Al Viro	6a0eec8224	x86, um: get rid of system.h -> system.h include 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>	2008-10-22 22:55:21 -07:00

Al Viro

uml got broken by commit 30742d5c22

... if you revert a commit, revert the fixups elsewhere that had been
triggered by it.  Such as 8c56250f48
(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>

2009-01-05 17:41:45 -08:00

Ingo Molnar

d1a76187a5

Merge commit 'v2.6.28-rc2' into core/locking

Conflicts:
	arch/um/include/asm/system.h

2008-10-28 16:54:49 +01:00

Al Viro

6a0eec8224

x86, um: get rid of system.h -> system.h include

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>

2008-10-22 22:55:21 -07:00

3 Commits (275f675c24a16ea45cc78bc03ff73fd06be8bffb)