projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'riscv-for-linus-5.9-mw0' of git://git.kernel.org/pub/scm/linux/kernel...
[linux-2.6-microblaze.git]
/
arch
/
riscv
/
kernel
/
process.c
diff --git
a/arch/riscv/kernel/process.c
b/arch/riscv/kernel/process.c
index
824d117
..
2b97c49
100644
(file)
--- a/
arch/riscv/kernel/process.c
+++ b/
arch/riscv/kernel/process.c
@@
-24,6
+24,12
@@
register unsigned long gp_in_global __asm__("gp");
register unsigned long gp_in_global __asm__("gp");
+#ifdef CONFIG_STACKPROTECTOR
+#include <linux/stackprotector.h>
+unsigned long __stack_chk_guard __read_mostly;
+EXPORT_SYMBOL(__stack_chk_guard);
+#endif
+
extern asmlinkage void ret_from_fork(void);
extern asmlinkage void ret_from_kernel_thread(void);
extern asmlinkage void ret_from_fork(void);
extern asmlinkage void ret_from_kernel_thread(void);
@@
-101,8
+107,8
@@
int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src)
return 0;
}
return 0;
}
-int copy_thread
_tls(unsigned long clone_flags, unsigned long usp
,
-
unsigned long arg,
struct task_struct *p, unsigned long tls)
+int copy_thread
(unsigned long clone_flags, unsigned long usp, unsigned long arg
,
+
struct task_struct *p, unsigned long tls)
{
struct pt_regs *childregs = task_pt_regs(p);
{
struct pt_regs *childregs = task_pt_regs(p);