Module Name: src
Committed By: thorpej
Date: Wed Nov 21 09:49:39 UTC 2018
Modified Files:
src/sys/arch/arm/xscale: i80321_space.c
Log Message:
EINVAL (22) is a valid return value for ARM mmap routines; we need to
return -1 for invalid mmap attempts.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/xscale/i80321_space.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/xscale/i80321_space.c
diff -u src/sys/arch/arm/xscale/i80321_space.c:1.16 src/sys/arch/arm/xscale/i80321_space.c:1.17
--- src/sys/arch/arm/xscale/i80321_space.c:1.16 Sun Nov 18 06:28:39 2018
+++ src/sys/arch/arm/xscale/i80321_space.c Wed Nov 21 09:49:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: i80321_space.c,v 1.16 2018/11/18 06:28:39 macallan Exp $ */
+/* $NetBSD: i80321_space.c,v 1.17 2018/11/21 09:49:39 thorpej Exp $ */
/*
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i80321_space.c,v 1.16 2018/11/18 06:28:39 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i80321_space.c,v 1.17 2018/11/21 09:49:39 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -304,10 +304,10 @@ i80321_io_bs_mmap(void *t, bus_addr_t ad
busbase = sc->sc_ioout_xlate;
winpaddr = VERDE_OUT_XLATE_IO_WIN0_BASE;
} else
- return (EINVAL);
+ return (-1);
if ((bpa) >= (busbase + VERDE_OUT_XLATE_IO_WIN_SIZE))
- return (EINVAL);
+ return (-1);
return (arm_btop(winpaddr + (bpa - busbase)));
}
@@ -459,10 +459,10 @@ i80321_mem_bs_mmap(void *t, bus_addr_t a
busbase = VERDE_OUT_DIRECT_WIN_BASE;
physbase = VERDE_OUT_DIRECT_WIN_BASE;
} else
- return (EINVAL);
+ return (-1);
if (bpa >= (VERDE_OUT_DIRECT_WIN_BASE +
VERDE_OUT_DIRECT_WIN_SIZE))
- return (EINVAL);
+ return (-1);
#else
if (bpa >= sc->sc_owin[0].owin_xlate_lo &&
bpa < (sc->sc_owin[0].owin_xlate_lo +
@@ -470,9 +470,9 @@ i80321_mem_bs_mmap(void *t, bus_addr_t a
busbase = sc->sc_owin[0].owin_xlate_lo;
physbase = sc->sc_iwin[1].iwin_xlate;
} else
- return (EINVAL);
+ return (-1);
if (bpa >= (busbase + VERDE_OUT_XLATE_MEM_WIN_SIZE))
- return (EINVAL);
+ return (-1);
#endif
pa = trunc_page((bpa - busbase) + physbase);
