diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-08 12:37:17 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-08 12:37:17 +0000 |
| commit | 9aa9eb41942b918f385ccabd2efdd6e7e4232165 (patch) | |
| tree | 20bec7da036d31ec185dfc1dcc00753c7ac9b170 /arch/alpha | |
| parent | 87075e049581f880f01eb0b41aa6ac807b299e35 (diff) | |
Merge with Linux 2.4.0-test6-pre1.
Diffstat (limited to 'arch/alpha')
| -rw-r--r-- | arch/alpha/kernel/entry.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/alpha/kernel/entry.S b/arch/alpha/kernel/entry.S index d77c2efc6..253b8d6c1 100644 --- a/arch/alpha/kernel/entry.S +++ b/arch/alpha/kernel/entry.S @@ -6,6 +6,7 @@ #include <linux/config.h> #include <asm/system.h> +#include <asm/cache.h> #define SIGCHLD 20 @@ -577,7 +578,7 @@ ret_from_sys_call: cmovne $26,0,$19 /* $19 = 0 => non-restartable */ ldl $3,TASK_PROCESSOR($8) lda $4,softirq_state - sll $3,5,$3 + sll $3,L1_CACHE_SHIFT,$3 addq $3,$4,$4 ldq $4,0($4) sll $4,32,$3 |