|
@@ -36,6 +36,7 @@
|
|
#include <asm/context_tracking.h>
|
|
#include <asm/context_tracking.h>
|
|
#include <asm/tm.h>
|
|
#include <asm/tm.h>
|
|
#include <asm/ppc-opcode.h>
|
|
#include <asm/ppc-opcode.h>
|
|
|
|
+#include <asm/barrier.h>
|
|
#include <asm/export.h>
|
|
#include <asm/export.h>
|
|
#ifdef CONFIG_PPC_BOOK3S
|
|
#ifdef CONFIG_PPC_BOOK3S
|
|
#include <asm/exception-64s.h>
|
|
#include <asm/exception-64s.h>
|
|
@@ -178,6 +179,15 @@ system_call: /* label this so stack traces look sane */
|
|
clrldi r8,r8,32
|
|
clrldi r8,r8,32
|
|
15:
|
|
15:
|
|
slwi r0,r0,4
|
|
slwi r0,r0,4
|
|
|
|
+
|
|
|
|
+ barrier_nospec_asm
|
|
|
|
+ /*
|
|
|
|
+ * Prevent the load of the handler below (based on the user-passed
|
|
|
|
+ * system call number) being speculatively executed until the test
|
|
|
|
+ * against NR_syscalls and branch to .Lsyscall_enosys above has
|
|
|
|
+ * committed.
|
|
|
|
+ */
|
|
|
|
+
|
|
ldx r12,r11,r0 /* Fetch system call handler [ptr] */
|
|
ldx r12,r11,r0 /* Fetch system call handler [ptr] */
|
|
mtctr r12
|
|
mtctr r12
|
|
bctrl /* Call handler */
|
|
bctrl /* Call handler */
|