diff options
author | Olof Johansson <olof@lixom.net> | 2012-09-07 18:02:20 -0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-09-07 18:02:20 -0400 |
commit | cba82925c249e9d001ce98fef17d9c6360d86e70 (patch) | |
tree | 1076140e2e51da648a9f8dcc35a5f2e8a95a0240 /arch/parisc/kernel/process.c | |
parent | 301fd5c13257862df66c81c48d963d474e63e0ef (diff) | |
parent | 7a5deff68f9e0a1db170ac9dd3b2b4aaddc1b80c (diff) |
Merge branch 'lpc32xx/core' of git://git.antcom.de/linux-2.6 into next/soc
* 'lpc32xx/core' of git://git.antcom.de/linux-2.6:
ARM: LPC32xx: Remove board specific GPIO init
ARM: LPC32xx: Provide DMA filter callbacks via platform data
ARM: LPC32xx: Use handle_edge_irq() callback on edge type irqs
+ sync to 3.6-rc4
Diffstat (limited to 'arch/parisc/kernel/process.c')
-rw-r--r-- | arch/parisc/kernel/process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/kernel/process.c b/arch/parisc/kernel/process.c index d4b94b395c16..2c05a9292a81 100644 --- a/arch/parisc/kernel/process.c +++ b/arch/parisc/kernel/process.c | |||
@@ -309,7 +309,7 @@ copy_thread(unsigned long clone_flags, unsigned long usp, | |||
309 | cregs->ksp = (unsigned long)stack | 309 | cregs->ksp = (unsigned long)stack |
310 | + (pregs->gr[21] & (THREAD_SIZE - 1)); | 310 | + (pregs->gr[21] & (THREAD_SIZE - 1)); |
311 | cregs->gr[30] = usp; | 311 | cregs->gr[30] = usp; |
312 | if (p->personality == PER_HPUX) { | 312 | if (personality(p->personality) == PER_HPUX) { |
313 | #ifdef CONFIG_HPUX | 313 | #ifdef CONFIG_HPUX |
314 | cregs->kpc = (unsigned long) &hpux_child_return; | 314 | cregs->kpc = (unsigned long) &hpux_child_return; |
315 | #else | 315 | #else |