Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 209937
b: refs/heads/master
c: 9904b00
h: refs/heads/master
i:
  209935: fd3dd6b
v: v3
  • Loading branch information
Denis Kirjanov authored and Benjamin Herrenschmidt committed Aug 24, 2010
1 parent 6ebbd96 commit 2d0eb30
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 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: 79c3095fb39964d0d44368cbbb4eff5b52c43d2c
refs/heads/master: 9904b00593f548156962764f67b1bb23f4da56fc
6 changes: 3 additions & 3 deletions trunk/arch/powerpc/kernel/process.c
Original file line number Diff line number Diff line change
Expand Up @@ -728,7 +728,7 @@ int copy_thread(unsigned long clone_flags, unsigned long usp,
p->thread.regs = childregs;
if (clone_flags & CLONE_SETTLS) {
#ifdef CONFIG_PPC64
if (!test_thread_flag(TIF_32BIT))
if (!is_32bit_task())
childregs->gpr[13] = childregs->gpr[6];
else
#endif
Expand Down Expand Up @@ -823,7 +823,7 @@ void start_thread(struct pt_regs *regs, unsigned long start, unsigned long sp)
regs->nip = start;
regs->msr = MSR_USER;
#else
if (!test_thread_flag(TIF_32BIT)) {
if (!is_32bit_task()) {
unsigned long entry, toc;

/* start is a relocated pointer to the function descriptor for
Expand Down Expand Up @@ -995,7 +995,7 @@ int sys_clone(unsigned long clone_flags, unsigned long usp,
if (usp == 0)
usp = regs->gpr[1]; /* stack pointer for child */
#ifdef CONFIG_PPC64
if (test_thread_flag(TIF_32BIT)) {
if (is_32bit_task()) {
parent_tidp = TRUNC_PTR(parent_tidp);
child_tidp = TRUNC_PTR(child_tidp);
}
Expand Down

0 comments on commit 2d0eb30

Please sign in to comment.