diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 17:17:53 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 17:17:53 +0000 |
| commit | b2ad5f821b1381492d792ca10b1eb7a107b48f14 (patch) | |
| tree | 954a648692e7da983db1d2470953705f6a729264 /include/asm-sparc | |
| parent | c9c06167e7933d93a6e396174c68abf242294abb (diff) | |
Merge with Linux 2.4.0-prerelease. Big Makefile rewrite, test your
Makefiles.
Diffstat (limited to 'include/asm-sparc')
| -rw-r--r-- | include/asm-sparc/contregs.h | 24 | ||||
| -rw-r--r-- | include/asm-sparc/mmu.h | 7 | ||||
| -rw-r--r-- | include/asm-sparc/processor.h | 6 |
3 files changed, 22 insertions, 15 deletions
diff --git a/include/asm-sparc/contregs.h b/include/asm-sparc/contregs.h index 1657f7d0b..3e4f5075e 100644 --- a/include/asm-sparc/contregs.h +++ b/include/asm-sparc/contregs.h @@ -8,23 +8,27 @@ * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) */ -/* 4=sun4 (as in sun4 sysmaint student book), c=sun4c (according to davem) */ +/* 3=sun3 + 4=sun4 (as in sun4 sysmaint student book) + c=sun4c (according to davem) */ -#define AC_IDPROM 0x00000000 /* 4 ID PROM, R/O, byte, 32 bytes */ -#define AC_CONTEXT 0x30000000 /* 4c current mmu-context */ -#define AC_SENABLE 0x40000000 /* 4c system dvma/cache/reset enable reg */ -#define AC_UDVMA_ENB 0x50000000 /* 4 Not used on Sun boards, byte */ -#define AC_BUS_ERROR 0x60000000 /* 4 Not cleared on read, byte. */ +#define AC_IDPROM 0x00000000 /* 34 ID PROM, R/O, byte, 32 bytes */ +#define AC_PAGEMAP 0x10000000 /* 3 Pagemap R/W, long */ +#define AC_SEGMAP 0x20000000 /* 3 Segment map, byte */ +#define AC_CONTEXT 0x30000000 /* 34c current mmu-context */ +#define AC_SENABLE 0x40000000 /* 34c system dvma/cache/reset enable reg*/ +#define AC_UDVMA_ENB 0x50000000 /* 34 Not used on Sun boards, byte */ +#define AC_BUS_ERROR 0x60000000 /* 34 Not cleared on read, byte. */ #define AC_SYNC_ERR 0x60000000 /* c fault type */ #define AC_SYNC_VA 0x60000004 /* c fault virtual address */ #define AC_ASYNC_ERR 0x60000008 /* c asynchronous fault type */ #define AC_ASYNC_VA 0x6000000c /* c async fault virtual address */ -#define AC_LEDS 0x70000000 /* 4 Zero turns on LEDs, byte */ -#define AC_CACHETAGS 0x80000000 /* 4c direct access to the VAC tags */ -#define AC_CACHEDDATA 0x90000000 /* c direct access to the VAC data */ +#define AC_LEDS 0x70000000 /* 34 Zero turns on LEDs, byte */ +#define AC_CACHETAGS 0x80000000 /* 34c direct access to the VAC tags */ +#define AC_CACHEDDATA 0x90000000 /* 3 c direct access to the VAC data */ #define AC_UDVMA_MAP 0xD0000000 /* 4 Not used on Sun boards, byte */ #define AC_VME_VECTOR 0xE0000000 /* 4 For non-Autovector VME, byte */ -#define AC_BOOT_SCC 0xF0000000 /* 4 bypass to access Zilog 8530. byte. */ +#define AC_BOOT_SCC 0xF0000000 /* 34 bypass to access Zilog 8530. byte.*/ /* s=Swift, h=Ross_HyperSPARC, v=TI_Viking, t=Tsunami, r=Ross_Cypress */ #define AC_M_PCR 0x0000 /* shv Processor Control Reg */ diff --git a/include/asm-sparc/mmu.h b/include/asm-sparc/mmu.h new file mode 100644 index 000000000..ccd36d266 --- /dev/null +++ b/include/asm-sparc/mmu.h @@ -0,0 +1,7 @@ +#ifndef __MMU_H +#define __MMU_H + +/* Default "unsigned long" context */ +typedef unsigned long mm_context_t; + +#endif diff --git a/include/asm-sparc/processor.h b/include/asm-sparc/processor.h index 41b96727a..2be6f36f0 100644 --- a/include/asm-sparc/processor.h +++ b/include/asm-sparc/processor.h @@ -153,12 +153,8 @@ extern __inline__ void start_thread(struct pt_regs * regs, unsigned long pc, extern pid_t kernel_thread(int (*fn)(void *), void * arg, unsigned long flags); -#define copy_segments(__tsk, __mm) \ - if((__tsk) == current && \ - (__mm) != NULL) \ - flush_user_windows() +#define copy_segments(tsk, mm) do { } while (0) #define release_segments(mm) do { } while (0) -#define forget_segments() do { } while (0) #define get_wchan(__TSK) \ ({ extern void scheduling_functions_start_here(void); \ |