openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
This commit is contained in:
Will Deacon 2018-06-15 11:50:42 +01:00 committed by Catalin Marinas
parent d71be2b6c0
commit 2d1b2a91d5
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm64/kernel/ssbd.c
View File

@ -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)
return -ENODEV; return -ENODEV;
} }
} }
#endif /* PR_SPEC_STORE_BYPASS */