diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-16 18:49:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-16 18:49:22 -0700 |
| commit | 90a24a4a7e8f8b3488438276e1d15bb3762df31e (patch) | |
| tree | d669b36e7558fa9caa8d4466c09db928801d7a01 /arch | |
| parent | 85eae82a0855d49852b87deac8653e4ebc8b291f (diff) | |
| parent | 0c552e5fb9bec3d4942663a2a90e04a685fd8482 (diff) | |
Merge branch 'frv' (FRV patches from David Howells)
Merge emailed FRV fixes from David Howells.
* frv:
FRV: Fix linux/elf-fdpic.h
FRV: Fix const sections change
FRV: Fix incorrect symbol in copy_thread()
FRV: Fix VLIW packing constraint violation in entry.S
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/frv/kernel/entry.S | 4 | ||||
| -rw-r--r-- | arch/frv/kernel/process.c | 2 | ||||
| -rw-r--r-- | arch/frv/kernel/setup.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/arch/frv/kernel/entry.S b/arch/frv/kernel/entry.S index 00273296031..ee0beb354e4 100644 --- a/arch/frv/kernel/entry.S +++ b/arch/frv/kernel/entry.S @@ -867,8 +867,8 @@ ret_from_fork: ret_from_kernel_thread: lddi.p @(gr28,#REG_GR(8)),gr20 call schedule_tail - or.p gr20,gr20,gr8 - calll @(gr21,gr0) + calll.p @(gr21,gr0) + or gr20,gr20,gr8 bra sys_exit .globl ret_from_kernel_execve diff --git a/arch/frv/kernel/process.c b/arch/frv/kernel/process.c index 655d90d20bb..e1e3aa196aa 100644 --- a/arch/frv/kernel/process.c +++ b/arch/frv/kernel/process.c @@ -194,7 +194,7 @@ int copy_thread(unsigned long clone_flags, memset(childregs, 0, sizeof(struct pt_regs)); childregs->gr9 = usp; /* function */ childregs->gr8 = arg; - chilregs->psr = PSR_S; + childregs->psr = PSR_S; p->thread.pc = (unsigned long) ret_from_kernel_thread; save_user_regs(p->thread.user); return 0; diff --git a/arch/frv/kernel/setup.c b/arch/frv/kernel/setup.c index 1f1e5efb338..b8993c87d3d 100644 --- a/arch/frv/kernel/setup.c +++ b/arch/frv/kernel/setup.c @@ -112,9 +112,11 @@ char __initdata redboot_command_line[COMMAND_LINE_SIZE]; #ifdef CONFIG_PM #define __pminit #define __pminitdata +#define __pminitconst #else #define __pminit __init #define __pminitdata __initdata +#define __pminitconst __initconst #endif struct clock_cmode { |