From: ynorov@caviumnetworks.com (Yury Norov)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v6 12/21] arm64:ilp32: share HWCAP between LP64 and ILP32
Date: Fri, 8 Jan 2016 02:34:30 +0300 [thread overview]
Message-ID: <1452209679-19445-13-git-send-email-ynorov@caviumnetworks.com> (raw)
In-Reply-To: <1452209679-19445-1-git-send-email-ynorov@caviumnetworks.com>
From: Andrew Pinski <apinski@cavium.com>
Signed-off-by: Andrew Pinski <Andrew.Pinski@caviumnetworks.com>
Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Signed-off-by: Christoph Muellner <christoph.muellner@theobroma-systems.com>
Signed-off-by: Yury Norov <ynorov@caviumnetworks.com>
Reviewed-by: David Daney <ddaney@caviumnetworks.com>
---
arch/arm64/include/asm/hwcap.h | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/include/asm/hwcap.h b/arch/arm64/include/asm/hwcap.h
index 400b80b..bdb1ae6 100644
--- a/arch/arm64/include/asm/hwcap.h
+++ b/arch/arm64/include/asm/hwcap.h
@@ -47,9 +47,17 @@
#define ELF_HWCAP (elf_hwcap)
#ifdef CONFIG_COMPAT
-#define COMPAT_ELF_HWCAP (compat_elf_hwcap)
-#define COMPAT_ELF_HWCAP2 (compat_elf_hwcap2)
extern unsigned int compat_elf_hwcap, compat_elf_hwcap2;
+#define COMPAT_ELF_HWCAP \
+ (is_a32_compat_task() \
+ ? compat_elf_hwcap \
+ : (u32) elf_hwcap)
+
+#define COMPAT_ELF_HWCAP2 \
+ (is_a32_compat_task() \
+ ? compat_elf_hwcap2 \
+ : (u32) (elf_hwcap >> 32))
+
#endif
enum {
--
2.5.0
next prev parent reply other threads:[~2016-01-07 23:34 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-07 23:34 [RFC4 PATCH v6 00/21] ILP32 for ARM64 Yury Norov
2016-01-07 23:34 ` [PATCH v6 01/21] arm64: ilp32: add documentation on the ILP32 ABI " Yury Norov
2016-01-07 23:34 ` [PATCH v6 02/21] arm64: ensure the kernel is compiled for LP64 Yury Norov
2016-01-07 23:34 ` [PATCH v6 03/21] arm64: rename COMPAT to AARCH32_EL0 in Kconfig Yury Norov
2016-01-07 23:34 ` [PATCH v6 04/21] arm64: change some CONFIG_COMPAT over to use CONFIG_AARCH32_EL0 instead Yury Norov
2016-01-07 23:34 ` [PATCH v6 05/21] arm64: compat: fix wrong dependency Yury Norov
2016-01-08 8:49 ` Arnd Bergmann
2016-01-07 23:34 ` [PATCH v6 06/21] arm64:uapi: set __BITS_PER_LONG correctly for ILP32 and LP64 Yury Norov
2016-01-07 23:34 ` [PATCH v6 07/21] thread: move thread bits accessors to separated file Yury Norov
2016-01-07 23:34 ` [PATCH v6 08/21] arm64: introduce is_a32_task and is_a32_thread (for AArch32 compat) Yury Norov
2016-01-07 23:34 ` [PATCH v6 09/21] arm64: ilp32: add is_ilp32_compat_{task, thread} and TIF_32BIT_AARCH64 Yury Norov
2016-01-07 23:34 ` [PATCH v6 10/21] arm64: introduce binfmt_elf32.c Yury Norov
2016-01-07 23:34 ` [PATCH v6 11/21] arm64: ilp32: introduce binfmt_ilp32.c Yury Norov
2016-01-07 23:45 ` Yury Norov
2016-01-08 9:08 ` Arnd Bergmann
2016-01-12 16:46 ` Yury Norov
2016-01-12 23:05 ` Arnd Bergmann
2016-01-07 23:34 ` Yury Norov [this message]
2016-01-08 8:58 ` [PATCH v6 12/21] arm64:ilp32: share HWCAP between LP64 and ILP32 Arnd Bergmann
2016-01-07 23:34 ` [PATCH v6 13/21] arm64: ptrace: handle ptrace_request differently for aarch32 and ilp32 Yury Norov
2016-01-08 9:01 ` Arnd Bergmann
2016-01-07 23:34 ` [PATCH v6 14/21] arm64:ilp32: add sys_ilp32.c and a separate table (in entry.S) to use it Yury Norov
2016-01-08 9:04 ` Arnd Bergmann
2016-01-08 9:21 ` Arnd Bergmann
2016-01-08 11:13 ` Yury Norov
2016-01-08 16:45 ` Arnd Bergmann
2016-01-13 16:21 ` Yury Norov
2016-01-07 23:34 ` [PATCH v6 15/21] arm64: signal: wrap struct ucontext, fp and lr with struct sigframe Yury Norov
2016-01-07 23:34 ` [PATCH v6 16/21] arm64: signal: share lp64 signal routines to ilp32 Yury Norov
2016-01-07 23:34 ` [PATCH v6 17/21] arm64: signal32: move ilp32 and aarch32 common code to separated file Yury Norov
2016-01-07 23:34 ` [PATCH v6 18/21] arm64: ilp32: introduce ilp32-specific handlers for sigframe Yury Norov
2016-01-07 23:34 ` [PATCH v6 19/21] arm64:ilp32: add vdso-ilp32 and use for signal return Yury Norov
2016-01-07 23:34 ` [PATCH v6 20/21] arm64:ilp32: change COMPAT_ELF_PLATFORM to report a a subplatform for ILP32 Yury Norov
2016-01-08 9:05 ` Arnd Bergmann
2016-01-07 23:34 ` [PATCH v6 21/21] arm64:ilp32: add ARM64_ILP32 to Kconfig Yury Norov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1452209679-19445-13-git-send-email-ynorov@caviumnetworks.com \
--to=ynorov@caviumnetworks.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox