Re: [ORLinux] [PATCH 17/35] Make asm-generic/cmpxchg.h #includeasm-generic/cmpxchg-local.h [ver #2]

[Jonas Bonn]

Hi David,

On 13 March 2012 10:00, Arnd Bergmann <arnd@xxxxxxxx> wrote:
> Acked-by: Arnd Bergmann <arnd@xxxxxxxx>
>
> I would suggest we merge this one through the openrisc tree, along with the
> other asm-generic patches in your series.
>
> asm-generic patches tend to have dependencies on other stuff and they
> rarely conflict with one another, so generally my preference is to have
> them sent by whoever needs them, with my ack.
>

I pulled patches 17-22 from your series into the openrisc tree to give
this a test.  In order to keep the series bisectable, I would need to
make the two changes below between patches 19 and 20.

Aside from this it looks good and I'd be happy to take this via the
OpenRISC tree.  If it's ok with you, I could just squash the two
changes below into patch 19 of your series... or if you think those
changes belong elsewhere, just let me know.  Building the OpenRISC
arch actually fails first after patch 20, but the modifications seem
to me to belong semantically to patch 19.

I did a build test for x86 with the changes below and it was fine...
didn't try any other arches.

/Jonas

diff --git a/include/asm-generic/bitops/atomic.h
b/include/asm-generic/bitops/atomic.h
index ecc44a8..8054ef5 100644
--- a/include/asm-generic/bitops/atomic.h
+++ b/include/asm-generic/bitops/atomic.h
@@ -2,7 +2,6 @@
 #define _ASM_GENERIC_BITOPS_ATOMIC_H_

 #include <asm/types.h>
-#include <asm/system.h>

 #ifdef CONFIG_SMP
 #include <asm/spinlock.h>
diff --git a/include/asm-generic/cmpxchg.h b/include/asm-generic/cmpxchg.h
index 8a36183..8be9a37 100644
--- a/include/asm-generic/cmpxchg.h
+++ b/include/asm-generic/cmpxchg.h
@@ -11,6 +11,7 @@
 #endif

 #include <linux/irqflags.h>
+#include <linux/types.h>

 #ifndef xchg
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/