summaryrefslogtreecommitdiff
path: root/arch/arm64/include
diff options
context:
space:
mode:
authorSatya Durga Srinivasu Prabhala <satyap@codeaurora.org>2016-08-15 11:03:23 -0700
committerSatya Durga Srinivasu Prabhala <satyap@codeaurora.org>2016-08-15 15:10:42 -0700
commitc14c8b7e5568aee21796230b4d03e18d028fcda5 (patch)
treec640cadde34797b30bb7bbdfb1952fc8cca8e8c6 /arch/arm64/include
parent0a3bee11ebe2d5da0d4432ec6530a708694bd3d4 (diff)
Revert "arm64: fpsimd: Enable FP(floating-point) settings for msm8996"
This reverts commit 2dae58c4af32 ("arm64: fpsimd: Enable FP(floating-point) settings for msm8996"). Feature is not applicable to msmcobalt and only applicable to MSM8996. CRs-Fixed: 1054373 Change-Id: I8f21787f0a45dd9f7be8986b4f332f498add3203 Signed-off-by: Satya Durga Srinivasu Prabhala <satyap@codeaurora.org>
Diffstat (limited to 'arch/arm64/include')
-rw-r--r--arch/arm64/include/asm/elf.h9
-rw-r--r--arch/arm64/include/asm/fpsimd.h12
2 files changed, 1 insertions, 20 deletions
diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h
index 6c0f3564f6a9..faad6df49e5b 100644
--- a/arch/arm64/include/asm/elf.h
+++ b/arch/arm64/include/asm/elf.h
@@ -23,7 +23,6 @@
*/
#include <asm/ptrace.h>
#include <asm/user.h>
-#include <asm/fpsimd.h>
typedef unsigned long elf_greg_t;
@@ -178,13 +177,7 @@ typedef compat_elf_greg_t compat_elf_gregset_t[COMPAT_ELF_NGREG];
((x)->e_flags & EF_ARM_EABI_MASK))
#define compat_start_thread compat_start_thread
-#define COMPAT_SET_PERSONALITY(ex) \
-do { \
- if (current->mm) \
- fpsimd_enable_trap(); \
- set_thread_flag(TIF_32BIT); \
-} while (0)
-
+#define COMPAT_SET_PERSONALITY(ex) set_thread_flag(TIF_32BIT);
#define COMPAT_ARCH_DLINFO
extern int aarch32_setup_vectors_page(struct linux_binprm *bprm,
int uses_interp);
diff --git a/arch/arm64/include/asm/fpsimd.h b/arch/arm64/include/asm/fpsimd.h
index 355871b7022f..50f559f574fe 100644
--- a/arch/arm64/include/asm/fpsimd.h
+++ b/arch/arm64/include/asm/fpsimd.h
@@ -81,18 +81,6 @@ extern void fpsimd_save_partial_state(struct fpsimd_partial_state *state,
u32 num_regs);
extern void fpsimd_load_partial_state(struct fpsimd_partial_state *state);
-#ifdef CONFIG_ENABLE_FP_SIMD_SETTINGS
-extern void fpsimd_disable_trap(void);
-extern void fpsimd_enable_trap(void);
-extern void fpsimd_settings_disable(void);
-extern void fpsimd_settings_enable(void);
-#else
-static inline void fpsimd_disable_trap(void) {}
-static inline void fpsimd_enable_trap(void) {}
-static inline void fpsimd_settings_disable(void) {}
-static inline void fpsimd_settings_enable(void) {}
-#endif
-
#endif
#endif