|
@@ -35,6 +35,7 @@
|
|
#include <asm/export.h>
|
|
#include <asm/export.h>
|
|
#include <asm/asm-405.h>
|
|
#include <asm/asm-405.h>
|
|
#include <asm/feature-fixups.h>
|
|
#include <asm/feature-fixups.h>
|
|
|
|
+#include <asm/barrier.h>
|
|
|
|
|
|
/*
|
|
/*
|
|
* MSR_KERNEL is > 0x10000 on 4xx/Book-E since it include MSR_CE.
|
|
* MSR_KERNEL is > 0x10000 on 4xx/Book-E since it include MSR_CE.
|
|
@@ -360,6 +361,15 @@ syscall_dotrace_cont:
|
|
ori r10,r10,sys_call_table@l
|
|
ori r10,r10,sys_call_table@l
|
|
slwi r0,r0,2
|
|
slwi r0,r0,2
|
|
bge- 66f
|
|
bge- 66f
|
|
|
|
+
|
|
|
|
+ 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 .66f above has
|
|
|
|
+ * committed.
|
|
|
|
+ */
|
|
|
|
+
|
|
lwzx r10,r10,r0 /* Fetch system call handler [ptr] */
|
|
lwzx r10,r10,r0 /* Fetch system call handler [ptr] */
|
|
mtlr r10
|
|
mtlr r10
|
|
addi r9,r1,STACK_FRAME_OVERHEAD
|
|
addi r9,r1,STACK_FRAME_OVERHEAD
|