Commit 2d1b2a91 authored by Will Deacon's avatar Will Deacon Committed by Catalin Marinas

arm64: ssbd: Drop #ifdefs for PR_SPEC_STORE_BYPASS

Now that we're all merged nicely into mainline, there's no need to check
to see if PR_SPEC_STORE_BYPASS is defined.
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent d71be2b6
...@@ -11,9 +11,7 @@ ...@@ -11,9 +11,7 @@
/* /*
* prctl interface for SSBD * prctl interface for SSBD
* FIXME: Drop the below ifdefery once merged in 4.18.
*/ */
#ifdef PR_SPEC_STORE_BYPASS
static int ssbd_prctl_set(struct task_struct *task, unsigned long ctrl) static int ssbd_prctl_set(struct task_struct *task, unsigned long ctrl)
{ {
int state = arm64_get_ssbd_state(); int state = arm64_get_ssbd_state();
...@@ -107,4 +105,3 @@ int arch_prctl_spec_ctrl_get(struct task_struct *task, unsigned long which) ...@@ -107,4 +105,3 @@ int arch_prctl_spec_ctrl_get(struct task_struct *task, unsigned long which)
return -ENODEV; return -ENODEV;
} }
} }
#endif /* PR_SPEC_STORE_BYPASS */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment