diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
| commit | d6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch) | |
| tree | e2be02f33984c48ec019c654051d27964e42c441 /arch/sparc/ap1000/msc.c | |
| parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) | |
Merge with 2.3.19.
Diffstat (limited to 'arch/sparc/ap1000/msc.c')
| -rw-r--r-- | arch/sparc/ap1000/msc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/sparc/ap1000/msc.c b/arch/sparc/ap1000/msc.c index 01337a53a..088df765c 100644 --- a/arch/sparc/ap1000/msc.c +++ b/arch/sparc/ap1000/msc.c @@ -17,7 +17,7 @@ #include <asm/irq.h> #include <asm/pgtable.h> #include <asm/ap1000/pgtapmmu.h> -#include <linux/tasks.h> +#include <linux/threads.h> #include <linux/sched.h> #include <linux/interrupt.h> @@ -623,8 +623,8 @@ static void fail_write(int context,int intr,unsigned vaddr) if (vaddr - MSC_REM_SIGNAL < _NSIG*PAGE_SIZE) { handle_signal(context,vaddr); } else { - task[tsk]->tss.sig_address = vaddr; - task[tsk]->tss.sig_desc = SUBSIG_NOMAPPING; + task[tsk]->thread.sig_address = vaddr; + task[tsk]->thread.sig_desc = SUBSIG_NOMAPPING; send_sig(SIGSEGV, task[tsk], 1); } } @@ -650,8 +650,8 @@ static void fail_read(int context,int intr,unsigned vaddr) if (vaddr - MSC_REM_SIGNAL < _NSIG*PAGE_SIZE) { handle_signal(context,vaddr); } else { - task[tsk]->tss.sig_address = vaddr; - task[tsk]->tss.sig_desc = SUBSIG_NOMAPPING; + task[tsk]->thread.sig_address = vaddr; + task[tsk]->thread.sig_desc = SUBSIG_NOMAPPING; send_sig(SIGSEGV, task[tsk], 1); } } |