The newly introduced gss_seq_send64_fetch_and_inc() fails to build on
32-bit architectures:
net/sunrpc/auth_gss/gss_krb5_seal.c:144:14: note: in expansion of macro 'cmpxchg'
seq_send = cmpxchg(&ctx->seq_send64, old, old + 1);
^~~~~~~
arch/x86/include/asm/cmpxchg.h:128:3: error: call to '__cmpxchg_wrong_size' declared with attribute error: Bad argument size for cmpxchg
__cmpxchg_wrong_size(); \
As the message tells us, cmpxchg() cannot be used on 64-bit arguments,
that's what cmpxchg64() does.
Fixes: 571ed1fd2390 ("SUNRPC: Replace krb5_seq_lock with a lockless scheme")
Signed-off-by: Arnd Bergmann <[email protected]>
---
net/sunrpc/auth_gss/gss_krb5_seal.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/sunrpc/auth_gss/gss_krb5_seal.c b/net/sunrpc/auth_gss/gss_krb5_seal.c
index 92594681d619..5775b9805bdc 100644
--- a/net/sunrpc/auth_gss/gss_krb5_seal.c
+++ b/net/sunrpc/auth_gss/gss_krb5_seal.c
@@ -141,7 +141,7 @@ gss_seq_send64_fetch_and_inc(struct krb5_ctx *ctx)
do {
old = seq_send;
- seq_send = cmpxchg(&ctx->seq_send64, old, old + 1);
+ seq_send = cmpxchg64(&ctx->seq_send64, old, old + 1);
} while (old != seq_send);
return seq_send;
}
--
2.18.0
T24gVHVlLCAyMDE4LTEwLTAyIGF0IDIyOjU3ICswMjAwLCBBcm5kIEJlcmdtYW5uIHdyb3RlOg0K
PiBUaGUgbmV3bHkgaW50cm9kdWNlZCBnc3Nfc2VxX3NlbmQ2NF9mZXRjaF9hbmRfaW5jKCkgZmFp
bHMgdG8gYnVpbGQgb24NCj4gMzItYml0IGFyY2hpdGVjdHVyZXM6DQo+IA0KPiBuZXQvc3VucnBj
L2F1dGhfZ3NzL2dzc19rcmI1X3NlYWwuYzoxNDQ6MTQ6IG5vdGU6IGluIGV4cGFuc2lvbiBvZg0K
PiBtYWNybyAnY21weGNoZycNCj4gICAgc2VxX3NlbmQgPSBjbXB4Y2hnKCZjdHgtPnNlcV9zZW5k
NjQsIG9sZCwgb2xkICsgMSk7DQo+ICAgICAgICAgICAgICAgXn5+fn5+fg0KPiBhcmNoL3g4Ni9p
bmNsdWRlL2FzbS9jbXB4Y2hnLmg6MTI4OjM6IGVycm9yOiBjYWxsIHRvDQo+ICdfX2NtcHhjaGdf
d3Jvbmdfc2l6ZScgZGVjbGFyZWQgd2l0aCBhdHRyaWJ1dGUgZXJyb3I6IEJhZCBhcmd1bWVudA0K
PiBzaXplIGZvciBjbXB4Y2hnDQo+ICAgIF9fY21weGNoZ193cm9uZ19zaXplKCk7ICAgICBcDQo+
IA0KPiBBcyB0aGUgbWVzc2FnZSB0ZWxscyB1cywgY21weGNoZygpIGNhbm5vdCBiZSB1c2VkIG9u
IDY0LWJpdA0KPiBhcmd1bWVudHMsDQo+IHRoYXQncyB3aGF0IGNtcHhjaGc2NCgpIGRvZXMuDQo+
IA0KPiBGaXhlczogNTcxZWQxZmQyMzkwICgiU1VOUlBDOiBSZXBsYWNlIGtyYjVfc2VxX2xvY2sg
d2l0aCBhIGxvY2tsZXNzDQo+IHNjaGVtZSIpDQo+IFNpZ25lZC1vZmYtYnk6IEFybmQgQmVyZ21h
bm4gPGFybmRAYXJuZGIuZGU+DQo+IC0tLQ0KPiAgbmV0L3N1bnJwYy9hdXRoX2dzcy9nc3Nfa3Ji
NV9zZWFsLmMgfCAyICstDQo+ICAxIGZpbGUgY2hhbmdlZCwgMSBpbnNlcnRpb24oKyksIDEgZGVs
ZXRpb24oLSkNCj4gDQo+IGRpZmYgLS1naXQgYS9uZXQvc3VucnBjL2F1dGhfZ3NzL2dzc19rcmI1
X3NlYWwuYw0KPiBiL25ldC9zdW5ycGMvYXV0aF9nc3MvZ3NzX2tyYjVfc2VhbC5jDQo+IGluZGV4
IDkyNTk0NjgxZDYxOS4uNTc3NWI5ODA1YmRjIDEwMDY0NA0KPiAtLS0gYS9uZXQvc3VucnBjL2F1
dGhfZ3NzL2dzc19rcmI1X3NlYWwuYw0KPiArKysgYi9uZXQvc3VucnBjL2F1dGhfZ3NzL2dzc19r
cmI1X3NlYWwuYw0KPiBAQCAtMTQxLDcgKzE0MSw3IEBAIGdzc19zZXFfc2VuZDY0X2ZldGNoX2Fu
ZF9pbmMoc3RydWN0IGtyYjVfY3R4DQo+ICpjdHgpDQo+ICANCj4gIAlkbyB7DQo+ICAJCW9sZCA9
IHNlcV9zZW5kOw0KPiAtCQlzZXFfc2VuZCA9IGNtcHhjaGcoJmN0eC0+c2VxX3NlbmQ2NCwgb2xk
LCBvbGQgKyAxKTsNCj4gKwkJc2VxX3NlbmQgPSBjbXB4Y2hnNjQoJmN0eC0+c2VxX3NlbmQ2NCwg
b2xkLCBvbGQgKyAxKTsNCj4gIAl9IHdoaWxlIChvbGQgIT0gc2VxX3NlbmQpOw0KPiAgCXJldHVy
biBzZXFfc2VuZDsNCj4gIH0NCg0KVGhhbmtzIEFybmR0ISBBcHBsaWVkLg0KDQotLSANClRyb25k
IE15a2xlYnVzdA0KTGludXggTkZTIGNsaWVudCBtYWludGFpbmVyLCBIYW1tZXJzcGFjZQ0KdHJv
bmQubXlrbGVidXN0QGhhbW1lcnNwYWNlLmNvbQ0KDQoNCg==