diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-05-07 02:55:41 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-05-07 02:55:41 +0000 |
| commit | dcec8a13bf565e47942a1751a9cec21bec5648fe (patch) | |
| tree | 548b69625b18cc2e88c3e68d0923be546c9ebb03 /arch/sparc/kernel/sclow.S | |
| parent | 2e0f55e79c49509b7ff70ff1a10e1e9e90a3dfd4 (diff) | |
o Merge with Linux 2.1.99.
o Fix ancient bug in the ELF loader making ldd crash.
o Fix ancient bug in the keyboard code for SGI, SNI and Jazz.
Diffstat (limited to 'arch/sparc/kernel/sclow.S')
| -rw-r--r-- | arch/sparc/kernel/sclow.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/sparc/kernel/sclow.S b/arch/sparc/kernel/sclow.S index 06c028395..4da88bd0e 100644 --- a/arch/sparc/kernel/sclow.S +++ b/arch/sparc/kernel/sclow.S @@ -11,6 +11,7 @@ #include <asm/errno.h> #include <asm/winmacro.h> #include <asm/psr.h> +#include <asm/page.h> #define CC_AND_RETT \ set PSR_C, %l4; \ @@ -94,7 +95,7 @@ LABEL(sunossmask): .globl LABEL(getpagesize) LABEL(getpagesize): - set 4096, %i0 + set PAGE_SIZE, %i0 CC_AND_RETT /* XXX sys_nice() XXX */ |