diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 18:42:23 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 18:42:23 -0800 |
| commit | d27ba47e7e8c466c18983a1779d611f82d6a354f (patch) | |
| tree | 2870d82516be16e0cae63e1f7e84bd855bb34a23 /arch/sparc64/kernel/signal32.c | |
| parent | e3d8b77bc7a89d190ee895d0570af10c026e5086 (diff) | |
| parent | dd3e2dcf3408843ed35501c28626f389b30be756 (diff) | |
| download | blackbird-op-linux-d27ba47e7e8c466c18983a1779d611f82d6a354f.tar.gz blackbird-op-linux-d27ba47e7e8c466c18983a1779d611f82d6a354f.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'arch/sparc64/kernel/signal32.c')
| -rw-r--r-- | arch/sparc64/kernel/signal32.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/sparc64/kernel/signal32.c b/arch/sparc64/kernel/signal32.c index aecccd0df1d1..009a86e5ded4 100644 --- a/arch/sparc64/kernel/signal32.c +++ b/arch/sparc64/kernel/signal32.c @@ -863,6 +863,7 @@ static void new_setup_frame32(struct k_sigaction *ka, struct pt_regs *regs, pud_t *pudp = pud_offset(pgdp, address); pmd_t *pmdp = pmd_offset(pudp, address); pte_t *ptep; + pte_t pte; regs->u_regs[UREG_I7] = (unsigned long) (&(sf->insns[0]) - 2); @@ -873,9 +874,10 @@ static void new_setup_frame32(struct k_sigaction *ka, struct pt_regs *regs, preempt_disable(); ptep = pte_offset_map(pmdp, address); - if (pte_present(*ptep)) { + pte = *ptep; + if (pte_present(pte)) { unsigned long page = (unsigned long) - page_address(pte_page(*ptep)); + page_address(pte_page(pte)); wmb(); __asm__ __volatile__("flush %0 + %1" |
