diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-sparc/btfixup.h | 43 | ||||
| -rw-r--r-- | include/asm-sparc/page.h | 4 | ||||
| -rw-r--r-- | include/asm-sparc/ultra.h | 52 | ||||
| -rw-r--r-- | include/asm-sparc/vac-ops.h | 2 | ||||
| -rw-r--r-- | include/asm-sparc64/page.h | 5 |
5 files changed, 21 insertions, 85 deletions
diff --git a/include/asm-sparc/btfixup.h b/include/asm-sparc/btfixup.h index e2ad32144df2..f0ea6d09d1de 100644 --- a/include/asm-sparc/btfixup.h +++ b/include/asm-sparc/btfixup.h @@ -16,7 +16,22 @@ extern unsigned int ___illegal_use_of_BTFIXUP_SIMM13_in_module(void); extern unsigned int ___illegal_use_of_BTFIXUP_SETHI_in_module(void); extern unsigned int ___illegal_use_of_BTFIXUP_HALF_in_module(void); extern unsigned int ___illegal_use_of_BTFIXUP_INT_in_module(void); -#endif + +#define BTFIXUP_SIMM13(__name) ___illegal_use_of_BTFIXUP_SIMM13_in_module() +#define BTFIXUP_HALF(__name) ___illegal_use_of_BTFIXUP_HALF_in_module() +#define BTFIXUP_SETHI(__name) ___illegal_use_of_BTFIXUP_SETHI_in_module() +#define BTFIXUP_INT(__name) ___illegal_use_of_BTFIXUP_INT_in_module() +#define BTFIXUP_BLACKBOX(__name) ___illegal_use_of_BTFIXUP_BLACKBOX_in_module + +#else + +#define BTFIXUP_SIMM13(__name) ___sf_##__name() +#define BTFIXUP_HALF(__name) ___af_##__name() +#define BTFIXUP_SETHI(__name) ___hf_##__name() +#define BTFIXUP_INT(__name) ((unsigned int)&___i_##__name) +/* This must be written in assembly and present in a sethi */ +#define BTFIXUP_BLACKBOX(__name) ___b_##__name +#endif /* MODULE */ /* Fixup call xx */ @@ -30,12 +45,6 @@ extern unsigned int ___illegal_use_of_BTFIXUP_INT_in_module(void); #define BTFIXUPDEF_BLACKBOX(__name) \ extern unsigned ___bs_##__name[2]; -#ifdef MODULE -#define BTFIXUP_BLACKBOX(__name) ___illegal_use_of_BTFIXUP_BLACKBOX_in_module -#else -/* This must be written in assembly and present in a sethi */ -#define BTFIXUP_BLACKBOX(__name) ___b_##__name -#endif /* Put bottom 13bits into some register variable */ @@ -55,11 +64,6 @@ extern unsigned int ___illegal_use_of_BTFIXUP_INT_in_module(void); __asm__ ("or %%g0, ___s_" #__name "__btset_" #__val ", %0" : "=r"(ret));\ return ret; \ } -#ifdef MODULE -#define BTFIXUP_SIMM13(__name) ___illegal_use_of_BTFIXUP_SIMM13_in_module() -#else -#define BTFIXUP_SIMM13(__name) ___sf_##__name() -#endif /* Put either bottom 13 bits, or upper 22 bits into some register variable * (depending on the value, this will lead into sethi FIX, reg; or @@ -82,11 +86,6 @@ extern unsigned int ___illegal_use_of_BTFIXUP_INT_in_module(void); __asm__ ("or %%g0, ___a_" #__name "__btset_" #__val ", %0" : "=r"(ret));\ return ret; \ } -#ifdef MODULE -#define BTFIXUP_HALF(__name) ___illegal_use_of_BTFIXUP_HALF_in_module() -#else -#define BTFIXUP_HALF(__name) ___af_##__name() -#endif /* Put upper 22 bits into some register variable */ @@ -107,22 +106,12 @@ extern unsigned int ___illegal_use_of_BTFIXUP_INT_in_module(void); "=r"(ret)); \ return ret; \ } -#ifdef MODULE -#define BTFIXUP_SETHI(__name) ___illegal_use_of_BTFIXUP_SETHI_in_module() -#else -#define BTFIXUP_SETHI(__name) ___hf_##__name() -#endif /* Put a full 32bit integer into some register variable */ #define BTFIXUPDEF_INT(__name) \ extern unsigned char ___i_##__name; \ extern unsigned ___is_##__name[2]; -#ifdef MODULE -#define BTFIXUP_INT(__name) ___illegal_use_of_BTFIXUP_INT_in_module() -#else -#define BTFIXUP_INT(__name) ((unsigned int)&___i_##__name) -#endif #define BTFIXUPCALL_NORM 0x00000000 /* Always call */ #define BTFIXUPCALL_NOP 0x01000000 /* Possibly optimize to nop */ diff --git a/include/asm-sparc/page.h b/include/asm-sparc/page.h index 4ce13153c390..0c5b3a066d97 100644 --- a/include/asm-sparc/page.h +++ b/include/asm-sparc/page.h @@ -54,8 +54,8 @@ #define clear_page(page) memset((void *)(page), 0, PAGE_SIZE) #define copy_page(to,from) memcpy((void *)(to), (void *)(from), PAGE_SIZE) -#define clear_user_page(page, vaddr) clear_page(page) -#define copy_user_page(to, from, vaddr) copy_page(to, from) +#define clear_user_page(addr, vaddr, page) clear_page(addr) +#define copy_user_page(to, from, vaddr, page) copy_page(to, from) /* The following structure is used to hold the physical * memory configuration of the machine. This is filled in diff --git a/include/asm-sparc/ultra.h b/include/asm-sparc/ultra.h deleted file mode 100644 index fdc6c7f488f1..000000000000 --- a/include/asm-sparc/ultra.h +++ /dev/null @@ -1,52 +0,0 @@ -/* $Id: ultra.h,v 1.2 1995/11/25 02:33:10 davem Exp $ - * ultra.h: Definitions and defines for the TI V9 UltraSparc. - * - * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) - */ - -#ifndef _SPARC_ULTRA_H -#define _SPARC_ULTRA_H - -/* Spitfire MMU control register: - * - * ---------------------------------------------------------- - * | | IMPL | VERS | | MID | | - * ---------------------------------------------------------- - * 64 31-28 27-24 23-22 21-17 16 0 - * - * IMPL: Implementation of this Spitfire. - * VERS: Version of this Spitfire. - * MID: Module ID of this processor. - */ - -#define SPITFIRE_MIDMASK 0x00000000003e0000 - -/* Spitfire Load Store Unit control register: - * - * --------------------------------------------------------------------- - * | RSV | PWR | PWW | VWR | VWW | RSV | PMASK | DME | IME | DCE | ICE | - * --------------------------------------------------------------------- - * 63-25 24 23 22 21 20 19-4 3 2 1 0 - * - * PWR: Physical Watchpoint Read enable: 0=off 1=on - * PWW: Physical Watchpoint Write enable: 0=off 1=on - * VWR: Virtual Watchpoint Read enable: 0=off 1=on - * VWW: Virtual Watchpoint Write enable: 0=off 1=on - * PMASK: Parity MASK ??? - * DME: Data MMU Enable: 0=off 1=on - * IME: Instruction MMU Enable: 0=off 1=on - * DCE: Data Cache Enable: 0=off 1=on - * ICE: Instruction Cache Enable: 0=off 1=on - */ - -#define SPITFIRE_LSU_PWR 0x01000000 -#define SPITFIRE_LSU_PWW 0x00800000 -#define SPITFIRE_LSU_VWR 0x00400000 -#define SPITFIRE_LSU_VWW 0x00200000 -#define SPITFIRE_LSU_PMASK 0x000ffff0 -#define SPITFIRE_LSU_DME 0x00000008 -#define SPITFIRE_LSU_IME 0x00000004 -#define SPITFIRE_LSU_DCE 0x00000002 -#define SPITFIRE_LSU_ICE 0x00000001 - -#endif /* !(_SPARC_ULTRA_H) */ diff --git a/include/asm-sparc/vac-ops.h b/include/asm-sparc/vac-ops.h index eafe7a45287a..83ceb56d91ab 100644 --- a/include/asm-sparc/vac-ops.h +++ b/include/asm-sparc/vac-ops.h @@ -107,8 +107,6 @@ struct sun4c_vac_props { extern struct sun4c_vac_props sun4c_vacinfo; -extern void sun4c_flush_all(void); - /* sun4c_enable_vac() enables the sun4c virtual address cache. */ extern __inline__ void sun4c_enable_vac(void) { diff --git a/include/asm-sparc64/page.h b/include/asm-sparc64/page.h index a0ffd1ac93ea..c01cafda59ee 100644 --- a/include/asm-sparc64/page.h +++ b/include/asm-sparc64/page.h @@ -35,8 +35,9 @@ extern void do_BUG(const char *file, int line); extern void _clear_page(void *page); #define clear_page(X) _clear_page((void *)(X)) -extern void clear_user_page(void *page, unsigned long vaddr); -extern void copy_user_page(void *to, void *from, unsigned long vaddr); +struct page; +extern void clear_user_page(void *addr, unsigned long vaddr, struct page *page); +extern void copy_user_page(void *to, void *from, unsigned long vaddr, struct page *topage); /* GROSS, defining this makes gcc pass these types as aggregates, * and thus on the stack, turn this crap off... -DaveM |