[PATCH] IA64: Export <asm/cmpxchg.h> to userland

[PATCH] IA64: Export <asm/cmpxchg.h> to userland

[Ben Hutchings]

[-- Attachment #1: Type: text/plain, Size: 902 bytes --]

Parts of <asm/intrinsics.h> were moved to <asm/cmpxchg.h>, and the
former now includes the latter.  The former is exported to userland
so the latter must be too.

Cc: stable@vger.kernel.org # v3.4
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
Both these header files still provoke a lot of warnings from
headers_check, but this at least fixes the (new) fatal error.

Ben.

 arch/ia64/include/asm/Kbuild |    1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/ia64/include/asm/Kbuild b/arch/ia64/include/asm/Kbuild
index 241d1c5..c929a53 100644
--- a/arch/ia64/include/asm/Kbuild
+++ b/arch/ia64/include/asm/Kbuild
@@ -6,6 +6,7 @@ header-y += gcc_intrin.h
 header-y += ia64regs.h
 header-y += intel_intrin.h
 header-y += intrinsics.h
+header-y += cmpxchg.h
 header-y += perfmon.h
 header-y += perfmon_default_smpl.h
 header-y += ptrace_offsets.h
-- 
1.7.10



[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 828 bytes --]

RE: [PATCH] IA64: Export <asm/cmpxchg.h> to userland

[Luck, Tony]

PiBQYXJ0cyBvZiA8YXNtL2ludHJpbnNpY3MuaD4gd2VyZSBtb3ZlZCB0byA8YXNtL2NtcHhjaGcu
aD4sIGFuZCB0aGUNCj4gZm9ybWVyIG5vdyBpbmNsdWRlcyB0aGUgbGF0dGVyLiAgVGhlIGZvcm1l
ciBpcyBleHBvcnRlZCB0byB1c2VybGFuZA0KPiBzbyB0aGUgbGF0dGVyIG11c3QgYmUgdG9vLg0K
DQpBbHJlYWR5IHJlY2VpdmVkIGFuZCBhcHBsaWVkIGEgcGF0Y2ggdGhhdCBkb2VzIHRoaXMgKHRo
b3VnaCBpdCBhZGRlZA0KdGhlIGNtcHhjaGcuaCBhIGZldyBsaW5lcyBlYXJsaWVyIHRoYXQgeW91
IGRpZCkuDQoNClNlZSBjb21taXQ6IDk4ZTRjZmY3Mw0KDQpJdCBkaWRuJ3QgZ2V0IG1hcmtlZCBm
b3Igc3RhYmxlIHRob3VnaCAuLi4gc28gaWYgeW91IG5lZWQgdGhpcyB0bw0KZ2V0IHB1bGxlZCBp
bnRvIHRoZSBzdGFibGUgYnJhbmNoZXMgeW91J2xsIG5lZWQgdG8gcG9rZSBHcmVnIGV0Yy4NCm1h
bnVhbGx5Lg0KDQotVG9ueQ0K

Re: [PATCH] IA64: Export <asm/cmpxchg.h> to userland

[Ben Hutchings]

On Thu, Jun 07, 2012 at 04:54:56PM +0000, Luck, Tony wrote:
> > Parts of <asm/intrinsics.h> were moved to <asm/cmpxchg.h>, and the
> > former now includes the latter.  The former is exported to userland
> > so the latter must be too.
> 
> Already received and applied a patch that does this (though it added
> the cmpxchg.h a few lines earlier that you did).
> 
> See commit: 98e4cff73
> 
> It didn't get marked for stable though ... so if you need this to
> get pulled into the stable branches you'll need to poke Greg etc.
> manually.

Greg, please cherry-pick commit
85f8f7759e418c814ee2ceacf73eddb9bed39492 ('[IA64] Add cmpxchg.h to
exported userspace headers') for 3.4.y.

Ben.

-- 
Ben Hutchings
We get into the habit of living before acquiring the habit of thinking.
                                                              - Albert Camus

Re: [PATCH] IA64: Export <asm/cmpxchg.h> to userland

[Greg Kroah-Hartman]

On Thu, Jun 07, 2012 at 09:07:13PM +0100, Ben Hutchings wrote:
> On Thu, Jun 07, 2012 at 04:54:56PM +0000, Luck, Tony wrote:
> > > Parts of <asm/intrinsics.h> were moved to <asm/cmpxchg.h>, and the
> > > former now includes the latter.  The former is exported to userland
> > > so the latter must be too.
> > 
> > Already received and applied a patch that does this (though it added
> > the cmpxchg.h a few lines earlier that you did).
> > 
> > See commit: 98e4cff73
> > 
> > It didn't get marked for stable though ... so if you need this to
> > get pulled into the stable branches you'll need to poke Greg etc.
> > manually.
> 
> Greg, please cherry-pick commit
> 85f8f7759e418c814ee2ceacf73eddb9bed39492 ('[IA64] Add cmpxchg.h to
> exported userspace headers') for 3.4.y.

I tried, but it doesn't apply properly.  Can someone backport it and
send it to me?

thanks,

greg k-h

Re: [PATCH] IA64: Export <asm/cmpxchg.h> to userland

[Ben Hutchings]

[-- Attachment #1: Type: text/plain, Size: 1200 bytes --]

On Fri, 2012-06-08 at 10:43 +0900, Greg Kroah-Hartman wrote:
> On Thu, Jun 07, 2012 at 09:07:13PM +0100, Ben Hutchings wrote:
> > On Thu, Jun 07, 2012 at 04:54:56PM +0000, Luck, Tony wrote:
> > > > Parts of <asm/intrinsics.h> were moved to <asm/cmpxchg.h>, and the
> > > > former now includes the latter.  The former is exported to userland
> > > > so the latter must be too.
> > > 
> > > Already received and applied a patch that does this (though it added
> > > the cmpxchg.h a few lines earlier that you did).
> > > 
> > > See commit: 98e4cff73
> > > 
> > > It didn't get marked for stable though ... so if you need this to
> > > get pulled into the stable branches you'll need to poke Greg etc.
> > > manually.
> > 
> > Greg, please cherry-pick commit
> > 85f8f7759e418c814ee2ceacf73eddb9bed39492 ('[IA64] Add cmpxchg.h to
> > exported userspace headers') for 3.4.y.
> 
> I tried, but it doesn't apply properly.  Can someone backport it and
> send it to me?

Sorry, I mean 98e4cff73a18af27f0d40d0b0d37f105dfc1994a; the former
commit is already in 3.4 and resulted in this breakage.

Ben.

-- 
Ben Hutchings
I haven't lost my mind; it's backed up on tape somewhere.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 828 bytes --]

Re: [PATCH] IA64: Export <asm/cmpxchg.h> to userland

[Greg Kroah-Hartman]

On Fri, Jun 08, 2012 at 03:09:50AM +0100, Ben Hutchings wrote:
> On Fri, 2012-06-08 at 10:43 +0900, Greg Kroah-Hartman wrote:
> > On Thu, Jun 07, 2012 at 09:07:13PM +0100, Ben Hutchings wrote:
> > > On Thu, Jun 07, 2012 at 04:54:56PM +0000, Luck, Tony wrote:
> > > > > Parts of <asm/intrinsics.h> were moved to <asm/cmpxchg.h>, and the
> > > > > former now includes the latter.  The former is exported to userland
> > > > > so the latter must be too.
> > > > 
> > > > Already received and applied a patch that does this (though it added
> > > > the cmpxchg.h a few lines earlier that you did).
> > > > 
> > > > See commit: 98e4cff73
> > > > 
> > > > It didn't get marked for stable though ... so if you need this to
> > > > get pulled into the stable branches you'll need to poke Greg etc.
> > > > manually.
> > > 
> > > Greg, please cherry-pick commit
> > > 85f8f7759e418c814ee2ceacf73eddb9bed39492 ('[IA64] Add cmpxchg.h to
> > > exported userspace headers') for 3.4.y.
> > 
> > I tried, but it doesn't apply properly.  Can someone backport it and
> > send it to me?
> 
> Sorry, I mean 98e4cff73a18af27f0d40d0b0d37f105dfc1994a; the former
> commit is already in 3.4 and resulted in this breakage.

Ah, that's better, now applied.

greg k-h