Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 334671
b: refs/heads/master
c: 16dd46b
h: refs/heads/master
i:
  334669: d403ef4
  334667: cebdc25
  334663: a9efc15
  334655: a83bdec
v: v3
  • Loading branch information
Catalin Marinas committed Oct 18, 2012
1 parent 0d8e740 commit f36d822
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 11 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f71a1a42667f576ec736bb1200eba2118fee3a22
refs/heads/master: 16dd46bb781a1d37eeb2377e8e48276e9d14d15d
10 changes: 0 additions & 10 deletions trunk/arch/arm64/include/asm/processor.h
Original file line number Diff line number Diff line change
Expand Up @@ -92,30 +92,20 @@ static inline void start_thread_common(struct pt_regs *regs, unsigned long pc)
static inline void start_thread(struct pt_regs *regs, unsigned long pc,
unsigned long sp)
{
unsigned long *stack = (unsigned long *)sp;

start_thread_common(regs, pc);
regs->pstate = PSR_MODE_EL0t;
regs->sp = sp;
regs->regs[2] = stack[2]; /* x2 (envp) */
regs->regs[1] = stack[1]; /* x1 (argv) */
regs->regs[0] = stack[0]; /* x0 (argc) */
}

#ifdef CONFIG_COMPAT
static inline void compat_start_thread(struct pt_regs *regs, unsigned long pc,
unsigned long sp)
{
unsigned int *stack = (unsigned int *)sp;

start_thread_common(regs, pc);
regs->pstate = COMPAT_PSR_MODE_USR;
if (pc & 1)
regs->pstate |= COMPAT_PSR_T_BIT;
regs->compat_sp = sp;
regs->regs[2] = stack[2]; /* x2 (envp) */
regs->regs[1] = stack[1]; /* x1 (argv) */
regs->regs[0] = stack[0]; /* x0 (argc) */
}
#endif

Expand Down

0 comments on commit f36d822

Please sign in to comment.