diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-31 17:02:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-31 17:02:20 -0700 |
| commit | a16d9d25c364dc0f4f9e4af7dad829e7ced07e47 (patch) | |
| tree | 6d46089783de3189df166a17783d0ccc53b942e1 /arch/parisc/kernel/process.c | |
| parent | a492246c3439bf2ba454f566258212f7bbd310bb (diff) | |
| parent | 5b24c421621792fcc588af6f644d6acf2dd798cc (diff) | |
| download | talos-obmc-linux-a16d9d25c364dc0f4f9e4af7dad829e7ced07e47.tar.gz talos-obmc-linux-a16d9d25c364dc0f4f9e4af7dad829e7ced07e47.zip | |
Merge tag 'parisc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6
Pull PARISC fixes from James Bottomley:
"This is a set of two bug fixes. One is the ATOMIC problem which is
now causing a compile failure in certain situations. The other is
mishandling of PER_LINUX32 which may also cause user visible effects.
Signed-off-by: James Bottomley <JBottomley@Parallels.com>"
* tag 'parisc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6:
[PARISC] fix personality flag check in copy_thread()
[PARISC] Redefine ATOMIC_INIT and ATOMIC64_INIT to drop the casts
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, cregs->ksp = (unsigned long)stack + (pregs->gr[21] & (THREAD_SIZE - 1)); cregs->gr[30] = usp; - if (p->personality == PER_HPUX) { + if (personality(p->personality) == PER_HPUX) { #ifdef CONFIG_HPUX cregs->kpc = (unsigned long) &hpux_child_return; #else |
