Don't declare the user_ldt functions unless USER_LDT is defined.
Eliminates an obnoxious warning.
This commit is contained in:
Garrett Wollman
parent
c906f8d406
commit
0b5b0f16a9
sys
@ -35,7 +35,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
|
||||
* $Id: machdep.c,v 1.195 1996/07/12 06:09:49 bde Exp $
|
||||
* $Id: machdep.c,v 1.196 1996/08/11 17:41:24 davidg Exp $
|
||||
*/
|
||||
|
||||
#include "npx.h"
|
||||
@ -185,12 +185,10 @@ vm_offset_t phys_avail[10];
|
||||
#define PHYS_AVAIL_ARRAY_END ((sizeof(phys_avail) / sizeof(vm_offset_t)) - 2)
|
||||
|
||||
static void dumpsys __P((void));
|
||||
static void setup_netisrs __P((struct linker_set *)); /* XXX declare elsewhere */
|
||||
|
||||
static vm_offset_t buffer_sva, buffer_eva;
|
||||
vm_offset_t clean_sva, clean_eva;
|
||||
static vm_offset_t pager_sva, pager_eva;
|
||||
extern struct linker_set netisr_set;
|
||||
|
||||
#define offsetof(type, member) ((size_t)(&((type *)0)->member))
|
||||
|
||||
@ -251,17 +249,6 @@ cpu_startup(dummy)
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Quickly wire in netisrs.
|
||||
*/
|
||||
setup_netisrs(&netisr_set);
|
||||
|
||||
/*
|
||||
#ifdef ISDN
|
||||
DONET(isdnintr, NETISR_ISDN);
|
||||
#endif
|
||||
*/
|
||||
|
||||
/*
|
||||
* Allocate space for system data structures.
|
||||
* The first available kernel virtual address is in "v".
|
||||
@ -440,33 +427,6 @@ again:
|
||||
}
|
||||
}
|
||||
|
||||
int
|
||||
register_netisr(num, handler)
|
||||
int num;
|
||||
netisr_t *handler;
|
||||
{
|
||||
|
||||
if (num < 0 || num >= (sizeof(netisrs)/sizeof(*netisrs)) ) {
|
||||
printf("register_netisr: bad isr number: %d\n", num);
|
||||
return (EINVAL);
|
||||
}
|
||||
netisrs[num] = handler;
|
||||
return (0);
|
||||
}
|
||||
|
||||
static void
|
||||
setup_netisrs(ls)
|
||||
struct linker_set *ls;
|
||||
{
|
||||
int i;
|
||||
const struct netisrtab *nit;
|
||||
|
||||
for(i = 0; ls->ls_items[i]; i++) {
|
||||
nit = (const struct netisrtab *)ls->ls_items[i];
|
||||
register_netisr(nit->nit_num, nit->nit_isr);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Send an interrupt to process.
|
||||
*
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)sys_machdep.c 5.5 (Berkeley) 1/19/91
|
||||
* $Id: sys_machdep.c,v 1.15 1996/03/03 01:57:44 jkh Exp $
|
||||
* $Id: sys_machdep.c,v 1.16 1996/06/12 05:02:53 gpalmer Exp $
|
||||
*
|
||||
*/
|
||||
|
||||
@ -64,8 +64,10 @@
|
||||
|
||||
|
||||
void set_user_ldt __P((struct pcb *pcb));
|
||||
#ifdef USER_LDT
|
||||
static int i386_get_ldt __P((struct proc *, char *, int *));
|
||||
static int i386_set_ldt __P((struct proc *, char *, int *));
|
||||
#endif
|
||||
|
||||
#ifndef _SYS_SYSPROTO_H_
|
||||
struct sysarch_args {
|
||||
|
||||
@ -35,7 +35,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
|
||||
* $Id: machdep.c,v 1.195 1996/07/12 06:09:49 bde Exp $
|
||||
* $Id: machdep.c,v 1.196 1996/08/11 17:41:24 davidg Exp $
|
||||
*/
|
||||
|
||||
#include "npx.h"
|
||||
@ -185,12 +185,10 @@ vm_offset_t phys_avail[10];
|
||||
#define PHYS_AVAIL_ARRAY_END ((sizeof(phys_avail) / sizeof(vm_offset_t)) - 2)
|
||||
|
||||
static void dumpsys __P((void));
|
||||
static void setup_netisrs __P((struct linker_set *)); /* XXX declare elsewhere */
|
||||
|
||||
static vm_offset_t buffer_sva, buffer_eva;
|
||||
vm_offset_t clean_sva, clean_eva;
|
||||
static vm_offset_t pager_sva, pager_eva;
|
||||
extern struct linker_set netisr_set;
|
||||
|
||||
#define offsetof(type, member) ((size_t)(&((type *)0)->member))
|
||||
|
||||
@ -251,17 +249,6 @@ cpu_startup(dummy)
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Quickly wire in netisrs.
|
||||
*/
|
||||
setup_netisrs(&netisr_set);
|
||||
|
||||
/*
|
||||
#ifdef ISDN
|
||||
DONET(isdnintr, NETISR_ISDN);
|
||||
#endif
|
||||
*/
|
||||
|
||||
/*
|
||||
* Allocate space for system data structures.
|
||||
* The first available kernel virtual address is in "v".
|
||||
@ -440,33 +427,6 @@ again:
|
||||
}
|
||||
}
|
||||
|
||||
int
|
||||
register_netisr(num, handler)
|
||||
int num;
|
||||
netisr_t *handler;
|
||||
{
|
||||
|
||||
if (num < 0 || num >= (sizeof(netisrs)/sizeof(*netisrs)) ) {
|
||||
printf("register_netisr: bad isr number: %d\n", num);
|
||||
return (EINVAL);
|
||||
}
|
||||
netisrs[num] = handler;
|
||||
return (0);
|
||||
}
|
||||
|
||||
static void
|
||||
setup_netisrs(ls)
|
||||
struct linker_set *ls;
|
||||
{
|
||||
int i;
|
||||
const struct netisrtab *nit;
|
||||
|
||||
for(i = 0; ls->ls_items[i]; i++) {
|
||||
nit = (const struct netisrtab *)ls->ls_items[i];
|
||||
register_netisr(nit->nit_num, nit->nit_isr);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Send an interrupt to process.
|
||||
*
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)sys_machdep.c 5.5 (Berkeley) 1/19/91
|
||||
* $Id: sys_machdep.c,v 1.15 1996/03/03 01:57:44 jkh Exp $
|
||||
* $Id: sys_machdep.c,v 1.16 1996/06/12 05:02:53 gpalmer Exp $
|
||||
*
|
||||
*/
|
||||
|
||||
@ -64,8 +64,10 @@
|
||||
|
||||
|
||||
void set_user_ldt __P((struct pcb *pcb));
|
||||
#ifdef USER_LDT
|
||||
static int i386_get_ldt __P((struct proc *, char *, int *));
|
||||
static int i386_set_ldt __P((struct proc *, char *, int *));
|
||||
#endif
|
||||
|
||||
#ifndef _SYS_SYSPROTO_H_
|
||||
struct sysarch_args {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user