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

Fixed unsigned longs that should have been vm_offset_t.

Browse Source 
vm_offset_t is currently unsigned long but should probably be plain
unsigned for i386's to match the choice of minimal types to represent
for fixed-width types in Lite2.  Anyway, it shouldn't be assumed
to be unsigned long.

I only fixed the type mismatches that were detected when I changed
vm_offset_t to unsigned.  Only pointer type mismatches were detected.
This commit is contained in:
Bruce Evans 1996-03-19 15:03:00 +00:00
parent a119b8be78
commit ede8dc43a2
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=14703
9 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/compat/linux/linux_misc.c
View File

@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: linux_misc.c,v 1.15 1996/03/10 23:25:17 peter Exp $
* $Id: linux_misc.c,v 1.16 1996/03/12 06:20:14 peter Exp $
*/
#include <sys/param.h>
@ -165,8 +165,10 @@ linux_uselib(struct proc *p, struct linux_uselib_args *args, int *retval)
struct vnode *vp;
struct exec *a_out;
struct vattr attr;
unsigned long vmaddr, file_offset;
unsigned long buffer, bss_size;
vm_offset_t vmaddr;
unsigned long file_offset;
vm_offset_t buffer;
unsigned long bss_size;
char *ptr;
int error;
caddr_t sg;

4
sys/dev/pci/pcivar.h
View File

@ -1,6 +1,6 @@
/**************************************************************************
**
** $Id: pcivar.h,v 1.8 1996/01/23 21:47:17 se Exp $
** $Id: pcivar.h,v 1.9 1996/01/25 18:32:00 se Exp $
**
** Declarations for pci device drivers.
**
@ -187,7 +187,7 @@ struct pci_externalize_buffer {
**-----------------------------------------------------------------
*/
int pci_map_mem (pcici_t tag, u_long entry, u_long * va, u_long * pa);
int pci_map_mem (pcici_t tag, u_long entry, vm_offset_t *va, vm_offset_t *pa);
/*-----------------------------------------------------------------
**

8
sys/i386/linux/imgact_linux.c
View File

@ -28,7 +28,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: imgact_linux.c,v 1.11 1996/03/10 23:25:17 peter Exp $
* $Id: imgact_linux.c,v 1.12 1996/03/12 06:20:16 peter Exp $
*/
#include <sys/param.h>
@ -61,8 +61,10 @@ exec_linux_imgact(imgp)
{
struct exec *a_out = (struct exec *) imgp->image_header;
struct vmspace *vmspace = imgp->proc->p_vmspace;
unsigned long vmaddr, virtual_offset, file_offset;
unsigned long buffer, bss_size;
vm_offset_t vmaddr;
unsigned long virtual_offset, file_offset;
vm_offset_t buffer;
unsigned long bss_size;
int error;
if (((a_out->a_magic >> 16) & 0xff) != 0x64)

8
sys/i386/linux/linux_misc.c
View File

@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: linux_misc.c,v 1.15 1996/03/10 23:25:17 peter Exp $
* $Id: linux_misc.c,v 1.16 1996/03/12 06:20:14 peter Exp $
*/
#include <sys/param.h>
@ -165,8 +165,10 @@ linux_uselib(struct proc *p, struct linux_uselib_args *args, int *retval)
struct vnode *vp;
struct exec *a_out;
struct vattr attr;
unsigned long vmaddr, file_offset;
unsigned long buffer, bss_size;
vm_offset_t vmaddr;
unsigned long file_offset;
vm_offset_t buffer;
unsigned long bss_size;
char *ptr;
int error;
caddr_t sg;

5
sys/kern/imgact_aout.c
View File

@ -28,7 +28,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: imgact_aout.c,v 1.23 1996/03/02 19:38:06 peter Exp $
* $Id: imgact_aout.c,v 1.24 1996/03/03 20:06:53 peter Exp $
*/
#include <sys/param.h>
@ -57,7 +57,8 @@ exec_aout_imgact(imgp)
{
struct exec *a_out = (struct exec *) imgp->image_header;
struct vmspace *vmspace = imgp->proc->p_vmspace;
unsigned long vmaddr, virtual_offset;
vm_offset_t vmaddr;
unsigned long virtual_offset;
unsigned long file_offset;
unsigned long bss_size;
int error;

4
sys/kern/imgact_gzip.c
View File

@ -6,7 +6,7 @@
* this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
* ----------------------------------------------------------------------------
*
* $Id: imgact_gzip.c,v 1.18 1996/01/19 03:57:56 dyson Exp $
* $Id: imgact_gzip.c,v 1.19 1996/02/13 14:16:36 phk Exp $
*
* This module handles execution of a.out files which have been run through
* "gzip". This saves diskspace, but wastes cpu-cycles and VM.
@ -136,7 +136,7 @@ do_aout_hdr(struct imgact_gzip * gz)
{
int error;
struct vmspace *vmspace = gz->ip->proc->p_vmspace;
u_long vmaddr;
vm_offset_t vmaddr;
/*
* Set file/virtual offset based on a.out variant. We do two cases:

2
sys/pci/meteor.c
View File

@ -885,7 +885,7 @@ met_attach(pcici_t tag, int unit)
mtr = &meteor[unit];
mtr->tag = tag;
pci_map_mem(tag, PCI_MAP_REG_START, (u_long *)&mtr->base,
pci_map_mem(tag, PCI_MAP_REG_START, (vm_offset_t *)&mtr->base,
&mtr->phys_base);
#ifdef METEOR_IRQ /* from the configuration file */

7
sys/pci/ncr.c
View File

@ -1,6 +1,6 @@
/**************************************************************************
**
** $Id: ncr.c,v 1.66 1996/03/11 19:25:58 se Exp $
** $Id: ncr.c,v 1.67 1996/03/11 19:36:07 se Exp $
**
** Device driver for the NCR 53C810 PCI-SCSI-Controller.
**
@ -1220,7 +1220,8 @@ static void ncb_profile (ncb_p np, ccb_p cp);
static void ncr_script_copy_and_bind
(struct script * script, ncb_p np);
static void ncr_script_fill (struct script * scr);
static int ncr_scatter (struct dsb* phys,u_long vaddr,u_long datalen);
static int ncr_scatter (struct dsb* phys, vm_offset_t vaddr,
vm_size_t datalen);
static void ncr_setmaxtags (tcb_p tp, u_long usrtags);
static void ncr_setsync (ncb_p np, ccb_p cp, u_char sxfer);
static void ncr_settags (tcb_p tp, lcb_p lp);
@ -1253,7 +1254,7 @@ static void ncr_attach (pcici_t tag, int unit);
static char ident[] =
"\n$Id: ncr.c,v 1.66 1996/03/11 19:25:58 se Exp $\n";
"\n$Id: ncr.c,v 1.67 1996/03/11 19:36:07 se Exp $\n";
static u_long ncr_version = NCR_VERSION * 11
+ (u_long) sizeof (struct ncb) * 7

4
sys/pci/pcivar.h
View File

@ -1,6 +1,6 @@
/**************************************************************************
**
** $Id: pcivar.h,v 1.8 1996/01/23 21:47:17 se Exp $
** $Id: pcivar.h,v 1.9 1996/01/25 18:32:00 se Exp $
**
** Declarations for pci device drivers.
**
@ -187,7 +187,7 @@ struct pci_externalize_buffer {
**-----------------------------------------------------------------
*/
int pci_map_mem (pcici_t tag, u_long entry, u_long * va, u_long * pa);
int pci_map_mem (pcici_t tag, u_long entry, vm_offset_t *va, vm_offset_t *pa);
/*-----------------------------------------------------------------
**