d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix mmioctl() for !DEVRANDOM case. mmioctl() is a function, not a

Browse Source 
pointer to a function.
This commit is contained in:
Bruce Evans 1995-10-29 11:37:56 +00:00
parent c91d636e6f
commit 00f7f6be8a
2 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/amd64/amd64/mem.c
View File

@ -38,7 +38,7 @@
*
* from: Utah $Hdr: mem.c 1.13 89/10/08$
* from: @(#)mem.c 7.2 (Berkeley) 5/9/91
* $Id: mem.c,v 1.14 1995/09/20 13:01:17 davidg Exp $
* $Id: mem.c,v 1.15 1995/10/28 16:57:55 markm Exp $
*/
/*
@ -54,6 +54,7 @@
#include <sys/proc.h>
#include <machine/cpu.h>
#include <machine/random.h>
#include <machine/psl.h>
#include <vm/vm.h>
@ -62,8 +63,6 @@
#include <vm/vm_prot.h>
#include <vm/pmap.h>
#include <machine/random.h>
#ifdef DEVFS
#include <sys/devfsext.h>
#include "sys/kernel.h"
@ -339,16 +338,19 @@ int memmmap(dev_t dev, int offset, int nprot)
}
}
#ifdef DEVRANDOM
/*
* Allow userland to select which interrupts will be used in the muck
* gathering business.
*/
int
mmioctl(dev_t dev, int cmd, caddr_t cmdarg, int flags, struct proc *p)
mmioctl(dev, cmd, cmdarg, flags, p)
dev_t dev;
int cmd;
caddr_t cmdarg;
int flags;
struct proc *p;
{
#ifdef DEVRANDOM
if (minor(dev) != 3 && minor(dev) != 4)
return (ENODEV);
@ -373,7 +375,7 @@ mmioctl(dev_t dev, int cmd, caddr_t cmdarg, int flags, struct proc *p)
return (ENOTTY);
}
return (0);
}
#else
d_ioctl_t *mmioctl = enodev;
#endif
return (ENODEV);
#endif /* DEVRANDOM */
}

22
sys/i386/i386/mem.c
View File

@ -38,7 +38,7 @@
*
* from: Utah $Hdr: mem.c 1.13 89/10/08$
* from: @(#)mem.c 7.2 (Berkeley) 5/9/91
* $Id: mem.c,v 1.14 1995/09/20 13:01:17 davidg Exp $
* $Id: mem.c,v 1.15 1995/10/28 16:57:55 markm Exp $
*/
/*
@ -54,6 +54,7 @@
#include <sys/proc.h>
#include <machine/cpu.h>
#include <machine/random.h>
#include <machine/psl.h>
#include <vm/vm.h>
@ -62,8 +63,6 @@
#include <vm/vm_prot.h>
#include <vm/pmap.h>
#include <machine/random.h>
#ifdef DEVFS
#include <sys/devfsext.h>
#include "sys/kernel.h"
@ -339,16 +338,19 @@ int memmmap(dev_t dev, int offset, int nprot)
}
}
#ifdef DEVRANDOM
/*
* Allow userland to select which interrupts will be used in the muck
* gathering business.
*/
int
mmioctl(dev_t dev, int cmd, caddr_t cmdarg, int flags, struct proc *p)
mmioctl(dev, cmd, cmdarg, flags, p)
dev_t dev;
int cmd;
caddr_t cmdarg;
int flags;
struct proc *p;
{
#ifdef DEVRANDOM
if (minor(dev) != 3 && minor(dev) != 4)
return (ENODEV);
@ -373,7 +375,7 @@ mmioctl(dev_t dev, int cmd, caddr_t cmdarg, int flags, struct proc *p)
return (ENOTTY);
}
return (0);
}
#else
d_ioctl_t *mmioctl = enodev;
#endif
return (ENODEV);
#endif /* DEVRANDOM */
}