From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sebastian Andrzej Siewior Subject: [PATCH 1/6 v2] sh: Move cmpxchg-xchg.h to asm-generic Date: Wed, 16 Oct 2019 00:31:55 +0200 Message-ID: <20191015223154.7wcsc7x5edrpasfc@flow> References: <20191013221310.30748-1-sebastian@breakpoint.cc> <20191013221310.30748-2-sebastian@breakpoint.cc> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: Arnd Bergmann Cc: linux-arch , Rich Felker , Yoshinori Sato , Linux-sh list , Peter Zijlstra , Russell King , Ingo Molnar , Waiman Long , Will Deacon , Linux ARM List-Id: linux-arch.vger.kernel.org VGhlIGhlYWRlciBmaWxlIGlzIHZlcnkgZ2VuZXJpYyBhbmQgY291bGQgYmUgcmV1c2VkIGJ5IG90 aGVyCmFyY2hpdGVjdHVyZXMgYXMgbG9uZyBhcyB0aGV5IHByb3ZpZGUgX19jbXB4Y2hnX3UzMigp LgoKTW92ZSBzaCdzIGNtcHhjaGcteGNoZy5oIHRvIGFzbS1nZW5lcmljLgoKQ2M6IFlvc2hpbm9y aSBTYXRvIDx5c2F0b0B1c2Vycy5zb3VyY2Vmb3JnZS5qcD4KQ2M6IFJpY2ggRmVsa2VyIDxkYWxp YXNAbGliYy5vcmc+CkNjOiBBcm5kIEJlcmdtYW5uIDxhcm5kQGFybmRiLmRlPgpDYzogbGludXgt c2hAdmdlci5rZXJuZWwub3JnCkNjOiBsaW51eC1hcmNoQHZnZXIua2VybmVsLm9yZwpBY2tlZC1i eTogQXJuZCBCZXJnbWFubiA8YXJuZEBhcm5kYi5kZT4KU2lnbmVkLW9mZi1ieTogU2ViYXN0aWFu IEFuZHJ6ZWogU2lld2lvciA8c2ViYXN0aWFuQGJyZWFrcG9pbnQuY2M+Ci0tLQp2MeKApnYyOiBz QF9fQVNNX1NIX0NNUFhDSEdfWENIR19IQF9fQVNNX0dFTkVSSUNfQ01QWENIR19YQ0hHX0hACgog YXJjaC9zaC9pbmNsdWRlL2FzbS9LYnVpbGQgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgfCAxICsKIHthcmNoL3NoL2luY2x1ZGUvYXNtID0+IGluY2x1ZGUvYXNtLWdlbmVyaWN9L2Nt cHhjaGcteGNoZy5oIHwgNiArKystLS0KIDIgZmlsZXMgY2hhbmdlZCwgNCBpbnNlcnRpb25zKCsp LCAzIGRlbGV0aW9ucygtKQogcmVuYW1lIHthcmNoL3NoL2luY2x1ZGUvYXNtID0+IGluY2x1ZGUv YXNtLWdlbmVyaWN9L2NtcHhjaGcteGNoZy5oICg5MSUpCgpkaWZmIC0tZ2l0IGEvYXJjaC9zaC9p bmNsdWRlL2FzbS9LYnVpbGQgYi9hcmNoL3NoL2luY2x1ZGUvYXNtL0tidWlsZAppbmRleCA1MWE1 NGRmMjJjMTEwLi4wOGMxZDk2Mjg2ZDlkIDEwMDY0NAotLS0gYS9hcmNoL3NoL2luY2x1ZGUvYXNt L0tidWlsZAorKysgYi9hcmNoL3NoL2luY2x1ZGUvYXNtL0tidWlsZApAQCAtMSw1ICsxLDYgQEAK ICMgU1BEWC1MaWNlbnNlLUlkZW50aWZpZXI6IEdQTC0yLjAKIGdlbmVyYXRlZC15ICs9IHN5c2Nh bGxfdGFibGUuaAorZ2VuZXJpYy15ICs9IGNtcHhjaGcteGNoZy5oCiBnZW5lcmljLXkgKz0gY29t cGF0LmgKIGdlbmVyaWMteSArPSBjdXJyZW50LmgKIGdlbmVyaWMteSArPSBkZWxheS5oCmRpZmYg LS1naXQgYS9hcmNoL3NoL2luY2x1ZGUvYXNtL2NtcHhjaGcteGNoZy5oIGIvaW5jbHVkZS9hc20t Z2VuZXJpYy9jbXB4Y2hnLXhjaGcuaApzaW1pbGFyaXR5IGluZGV4IDkxJQpyZW5hbWUgZnJvbSBh cmNoL3NoL2luY2x1ZGUvYXNtL2NtcHhjaGcteGNoZy5oCnJlbmFtZSB0byBpbmNsdWRlL2FzbS1n ZW5lcmljL2NtcHhjaGcteGNoZy5oCmluZGV4IGMzNzNmMjFlZmU0ZDkuLmM5YWNkNmZmODc0MWQg MTAwNjQ0Ci0tLSBhL2FyY2gvc2gvaW5jbHVkZS9hc20vY21weGNoZy14Y2hnLmgKKysrIGIvaW5j bHVkZS9hc20tZ2VuZXJpYy9jbXB4Y2hnLXhjaGcuaApAQCAtMSw2ICsxLDYgQEAKIC8qIFNQRFgt TGljZW5zZS1JZGVudGlmaWVyOiBHUEwtMi4wICovCi0jaWZuZGVmIF9fQVNNX1NIX0NNUFhDSEdf WENIR19ICi0jZGVmaW5lIF9fQVNNX1NIX0NNUFhDSEdfWENIR19ICisjaWZuZGVmIF9fQVNNX0dF TkVSSUNfQ01QWENIR19YQ0hHX0gKKyNkZWZpbmUgX19BU01fR0VORVJJQ19DTVBYQ0hHX1hDSEdf SAogCiAvKgogICogQ29weXJpZ2h0IChDKSAyMDE2IFJlZCBIYXQsIEluYy4KQEAgLTQ3LDQgKzQ3 LDQgQEAgc3RhdGljIGlubGluZSB1bnNpZ25lZCBsb25nIHhjaGdfdTgodm9sYXRpbGUgdTggKm0s IHVuc2lnbmVkIGxvbmcgdmFsKQogCXJldHVybiBfX3hjaGdfY21weGNoZyhtLCB2YWwsIHNpemVv ZiAqbSk7CiB9CiAKLSNlbmRpZiAvKiBfX0FTTV9TSF9DTVBYQ0hHX1hDSEdfSCAqLworI2VuZGlm IC8qIF9fQVNNX0dFTkVSSUNfQ01QWENIR19YQ0hHX0ggKi8KLS0gCjIuMjMuMAoKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmxpbnV4LWFybS1rZXJuZWwg bWFpbGluZyBsaXN0CmxpbnV4LWFybS1rZXJuZWxAbGlzdHMuaW5mcmFkZWFkLm9yZwpodHRwOi8v bGlzdHMuaW5mcmFkZWFkLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2xpbnV4LWFybS1rZXJuZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from Chamillionaire.breakpoint.cc ([193.142.43.52]:46416 "EHLO Chamillionaire.breakpoint.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731944AbfJOWcK (ORCPT ); Tue, 15 Oct 2019 18:32:10 -0400 Date: Wed, 16 Oct 2019 00:31:55 +0200 From: Sebastian Andrzej Siewior Subject: [PATCH 1/6 v2] sh: Move cmpxchg-xchg.h to asm-generic Message-ID: <20191015223154.7wcsc7x5edrpasfc@flow> References: <20191013221310.30748-1-sebastian@breakpoint.cc> <20191013221310.30748-2-sebastian@breakpoint.cc> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8BIT In-Reply-To: Sender: linux-arch-owner@vger.kernel.org List-ID: To: Arnd Bergmann Cc: Linux ARM , Peter Zijlstra , Russell King , Ingo Molnar , Waiman Long , Will Deacon , Yoshinori Sato , Rich Felker , Linux-sh list , linux-arch Message-ID: <20191015223155.nVfa_bxLrVXzTEDj0pS0tc2IVPw8roje5tHlhN0NNMY@z> The header file is very generic and could be reused by other architectures as long as they provide __cmpxchg_u32(). Move sh's cmpxchg-xchg.h to asm-generic. Cc: Yoshinori Sato Cc: Rich Felker Cc: Arnd Bergmann Cc: linux-sh@vger.kernel.org Cc: linux-arch@vger.kernel.org Acked-by: Arnd Bergmann Signed-off-by: Sebastian Andrzej Siewior --- v1…v2: s@__ASM_SH_CMPXCHG_XCHG_H@__ASM_GENERIC_CMPXCHG_XCHG_H@ arch/sh/include/asm/Kbuild | 1 + {arch/sh/include/asm => include/asm-generic}/cmpxchg-xchg.h | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) rename {arch/sh/include/asm => include/asm-generic}/cmpxchg-xchg.h (91%) diff --git a/arch/sh/include/asm/Kbuild b/arch/sh/include/asm/Kbuild index 51a54df22c110..08c1d96286d9d 100644 --- a/arch/sh/include/asm/Kbuild +++ b/arch/sh/include/asm/Kbuild @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 generated-y += syscall_table.h +generic-y += cmpxchg-xchg.h generic-y += compat.h generic-y += current.h generic-y += delay.h diff --git a/arch/sh/include/asm/cmpxchg-xchg.h b/include/asm-generic/cmpxchg-xchg.h similarity index 91% rename from arch/sh/include/asm/cmpxchg-xchg.h rename to include/asm-generic/cmpxchg-xchg.h index c373f21efe4d9..c9acd6ff8741d 100644 --- a/arch/sh/include/asm/cmpxchg-xchg.h +++ b/include/asm-generic/cmpxchg-xchg.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 */ -#ifndef __ASM_SH_CMPXCHG_XCHG_H -#define __ASM_SH_CMPXCHG_XCHG_H +#ifndef __ASM_GENERIC_CMPXCHG_XCHG_H +#define __ASM_GENERIC_CMPXCHG_XCHG_H /* * Copyright (C) 2016 Red Hat, Inc. @@ -47,4 +47,4 @@ static inline unsigned long xchg_u8(volatile u8 *m, unsigned long val) return __xchg_cmpxchg(m, val, sizeof *m); } -#endif /* __ASM_SH_CMPXCHG_XCHG_H */ +#endif /* __ASM_GENERIC_CMPXCHG_XCHG_H */ -- 2.23.0