2007-05-01 19:40:57

by Jeff Dike

[permalink] [raw]
Subject: [PATCH] UML - forgot asm-um/cmpxchg.h

The i386 and x86_64 cmpxchg patches require an asm-um/cmpxchg.h for
the UML build.

Signed-off-by: Jeff Dike <[email protected]>
--
include/asm-um/cmpxchg.h | 6 ++++++
1 file changed, 6 insertions(+)

Index: linux-2.6.21-mm/include/asm-um/cmpxchg.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.21-mm/include/asm-um/cmpxchg.h 2007-05-01 15:31:09.000000000 -0400
@@ -0,0 +1,6 @@
+#ifndef __UM_CMPXCHG_H
+#define __UM_CMPXCHG_H
+
+#include "asm/arch/cmpxchg.h"
+
+#endif


2007-05-03 06:09:30

by Andrew Morton

[permalink] [raw]
Subject: Re: [PATCH] UML - forgot asm-um/cmpxchg.h

On Tue, 1 May 2007 15:36:46 -0400 Jeff Dike <[email protected]> wrote:

> The i386 and x86_64 cmpxchg patches require an asm-um/cmpxchg.h for
> the UML build.
>
> Signed-off-by: Jeff Dike <[email protected]>
> --
> include/asm-um/cmpxchg.h | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> Index: linux-2.6.21-mm/include/asm-um/cmpxchg.h
> ===================================================================
> --- /dev/null 1970-01-01 00:00:00.000000000 +0000
> +++ linux-2.6.21-mm/include/asm-um/cmpxchg.h 2007-05-01 15:31:09.000000000 -0400
> @@ -0,0 +1,6 @@
> +#ifndef __UM_CMPXCHG_H
> +#define __UM_CMPXCHG_H
> +
> +#include "asm/arch/cmpxchg.h"
> +
> +#endif

OK, I clumped all three patches into one as I think that's required for
git-bisect friendliness.

2007-05-03 14:19:00

by Jeff Dike

[permalink] [raw]
Subject: Re: [PATCH] UML - forgot asm-um/cmpxchg.h

On Wed, May 02, 2007 at 11:09:19PM -0700, Andrew Morton wrote:
> OK, I clumped all three patches into one as I think that's required for
> git-bisect friendliness.

OK - I separated the i386 and x86_64 bits to make it easy to drop the
x86_64 part.

Plus, I think it doesn't make any difference - the headers behave the
same as seen from the outside, except that UML needs the uml-cmpxchg
patch in order to build. So, putting that first, then the other two
separately results in a patchset that builds at all stages, I believe.

Jeff

--
Work email - jdike at linux dot intel dot com