CVS commit: src/sys/arch/sgimips/stand
Module Name:src Committed By: tsutsui Date: Wed Jan 2 03:04:27 UTC 2019 Modified Files: src/sys/arch/sgimips/stand: Makefile.inc Log Message: Allow build in boot64 without installed DESTDIR. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/sgimips/stand/Makefile.inc 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/sgimips/stand/Makefile.inc diff -u src/sys/arch/sgimips/stand/Makefile.inc:1.2 src/sys/arch/sgimips/stand/Makefile.inc:1.3 --- src/sys/arch/sgimips/stand/Makefile.inc:1.2 Thu Sep 8 14:43:48 2016 +++ src/sys/arch/sgimips/stand/Makefile.inc Wed Jan 2 03:04:26 2019 @@ -1,5 +1,12 @@ -# $NetBSD: Makefile.inc,v 1.2 2016/09/08 14:43:48 christos Exp $ +# $NetBSD: Makefile.inc,v 1.3 2019/01/02 03:04:26 tsutsui Exp $ NOPIE= # defined BINDIR?= /usr/mdec + +# XXX SHOULD NOT NEED TO DEFINE THESE! +LIBCRT0= +LIBCRTI= +LIBC= +LIBCRTBEGIN= +LIBCRTEND=
CVS commit: xsrc/external/mit/xf86-video-ati/dist/src/AtomBios
Module Name:xsrc
Committed By: christos
Date: Wed Jan 2 02:58:48 UTC 2019
Modified Files:
xsrc/external/mit/xf86-video-ati/dist/src/AtomBios: CD_Operations.c
Log Message:
Remove compatibility code.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-ati/dist/src/AtomBios/CD_Operations.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-ati/dist/src/AtomBios/CD_Operations.c
diff -u xsrc/external/mit/xf86-video-ati/dist/src/AtomBios/CD_Operations.c:1.4 xsrc/external/mit/xf86-video-ati/dist/src/AtomBios/CD_Operations.c:1.5
--- xsrc/external/mit/xf86-video-ati/dist/src/AtomBios/CD_Operations.c:1.4 Mon Dec 31 19:34:52 2018
+++ xsrc/external/mit/xf86-video-ati/dist/src/AtomBios/CD_Operations.c Tue Jan 1 21:58:48 2019
@@ -215,30 +215,6 @@ VOID IndirectIOCommand_CLEAR(PARSER_TEMP
pParserTempData->IndirectData &= ~((0x >> (32-pParserTempData->IndirectIOTablePointer[1])) << pParserTempData->IndirectIOTablePointer[2]);
}
-/* from xorg-server 1.18 compiler.h */
-struct __una_u64 { uint64_t x __attribute__((packed)); };
-struct __una_u32 { uint32_t x __attribute__((packed)); };
-
-static __inline__ uint16_t ldw_u(uint16_t *p)
-{
- uint16_t ret;
- memmove(, p, sizeof(*p));
- return ret;
-}
-
-static __inline__ uint32_t ldl_u(uint32_t *p)
-{
- uint32_t ret;
- memmove(, p, sizeof(*p));
- return ret;
-}
-
-static __inline__ void stl_u(uint32_t val, uint32_t *p)
-{
- struct __una_u32 *ptr = (struct __una_u32 *) p;
- ptr->x = val;
-}
-
UINT32 IndirectInputOutput(PARSER_TEMP_DATA STACK_BASED * pParserTempData)
{
// if ((pParserTempData->IndirectData & 0x7f)==INDIRECT_IO_MM) pParserTempData->IndirectData|=pParserTempData->CurrentPortID;
CVS commit: xsrc/external/mit/xorg-server.old/dist/hw/xfree86/ramdac
Module Name:xsrc
Committed By: christos
Date: Wed Jan 2 02:56:43 UTC 2019
Modified Files:
xsrc/external/mit/xorg-server.old/dist/hw/xfree86/ramdac: xf86Cursor.c
Log Message:
ad provde the cursor function...
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xorg-server.old/dist/hw/xfree86/ramdac/xf86Cursor.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorg-server.old/dist/hw/xfree86/ramdac/xf86Cursor.c
diff -u xsrc/external/mit/xorg-server.old/dist/hw/xfree86/ramdac/xf86Cursor.c:1.1.1.1 xsrc/external/mit/xorg-server.old/dist/hw/xfree86/ramdac/xf86Cursor.c:1.2
--- xsrc/external/mit/xorg-server.old/dist/hw/xfree86/ramdac/xf86Cursor.c:1.1.1.1 Thu Jun 9 05:07:59 2016
+++ xsrc/external/mit/xorg-server.old/dist/hw/xfree86/ramdac/xf86Cursor.c Tue Jan 1 21:56:43 2019
@@ -475,3 +475,27 @@ xf86DeviceCursorCleanup(DeviceIntPtr pDe
(*ScreenPriv->spriteFuncs->DeviceCursorCleanup)(pDev, pScreen);
}
+
+/* Re-set the current cursor. This will switch between hardware and software
+ * cursor depending on whether hardware cursor is currently supported
+ * according to the driver.
+ */
+void
+xf86CursorResetCursor(ScreenPtr pScreen)
+{
+xf86CursorScreenPtr ScreenPriv;
+
+if (!inputInfo.pointer)
+return;
+
+if (!dixPrivateKeyRegistered(xf86CursorScreenKey))
+return;
+
+ScreenPriv = (xf86CursorScreenPtr) dixLookupPrivate(>devPrivates,
+xf86CursorScreenKey);
+if (!ScreenPriv)
+return;
+
+xf86CursorSetCursor(inputInfo.pointer, pScreen, ScreenPriv->CurrentCursor,
+ScreenPriv->x, ScreenPriv->y);
+}
CVS commit: xsrc/external/mit/xorg-server.old
Module Name:xsrc
Committed By: christos
Date: Wed Jan 2 02:55:41 UTC 2019
Modified Files:
xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common: xf86.h
xf86Mode.c xf86str.h xf86xvmc.h
xsrc/external/mit/xorg-server.old/dist/hw/xfree86/modes: xf86Crtc.c
xsrc/external/mit/xorg-server.old/dist/hw/xfree86/ramdac: xf86Cursor.h
xsrc/external/mit/xorg-server.old/dist/hw/xfree86/vbe: vbeModes.c
vbeModes.h
xsrc/external/mit/xorg-server.old/dist/include: misc.h
xsrc/external/mit/xorg-server.old/include: dix-config.h
Log Message:
Add compatibility to xorg-server-120
- Convert display modes arguments to const.
- Provive bswap* in misc.h
- Provide missing cursor function
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common/xf86.h \
xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common/xf86Mode.c \
xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common/xf86str.h \
xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common/xf86xvmc.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xorg-server.old/dist/hw/xfree86/modes/xf86Crtc.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xorg-server.old/dist/hw/xfree86/ramdac/xf86Cursor.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xorg-server.old/dist/hw/xfree86/vbe/vbeModes.c \
xsrc/external/mit/xorg-server.old/dist/hw/xfree86/vbe/vbeModes.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xorg-server.old/dist/include/misc.h
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xorg-server.old/include/dix-config.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common/xf86.h
diff -u xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common/xf86.h:1.1.1.1 xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common/xf86.h:1.2
--- xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common/xf86.h:1.1.1.1 Thu Jun 9 05:07:58 2016
+++ xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common/xf86.h Tue Jan 1 21:55:40 2019
@@ -306,7 +306,7 @@ extern _X_EXPORT ModeStatus xf86InitialC
extern _X_EXPORT ModeStatus xf86CheckModeForDriver(ScrnInfoPtr scrp, DisplayModePtr mode,
int flags);
extern _X_EXPORT int xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
- char **modeNames, ClockRangePtr clockRanges,
+ const char **modeNames, ClockRangePtr clockRanges,
int *linePitches, int minPitch, int maxPitch,
int minHeight, int maxHeight, int pitchInc,
int virtualX, int virtualY, int apertureSize,
Index: xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common/xf86Mode.c
diff -u xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common/xf86Mode.c:1.1.1.1 xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common/xf86Mode.c:1.2
--- xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common/xf86Mode.c:1.1.1.1 Thu Jun 9 05:07:58 2016
+++ xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common/xf86Mode.c Tue Jan 1 21:55:40 2019
@@ -1346,7 +1346,7 @@ scanLineWidth(
int
xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
- char **modeNames, ClockRangePtr clockRanges,
+ const char **modeNames, ClockRangePtr clockRanges,
int *linePitches, int minPitch, int maxPitch, int pitchInc,
int minHeight, int maxHeight, int virtualX, int virtualY,
int apertureSize, LookupModeFlags strategy)
Index: xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common/xf86str.h
diff -u xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common/xf86str.h:1.1.1.1 xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common/xf86str.h:1.2
--- xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common/xf86str.h:1.1.1.1 Thu Jun 9 05:07:58 2016
+++ xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common/xf86str.h Tue Jan 1 21:55:40 2019
@@ -413,7 +413,7 @@ typedef struct {
rgb blackColour;
rgb whiteColour;
int defaultVisual;
-char ** modes;
+const char ** modes;
pointer options;
} DispRec, *DispPtr;
Index: xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common/xf86xvmc.h
diff -u xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common/xf86xvmc.h:1.1.1.1 xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common/xf86xvmc.h:1.2
--- xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common/xf86xvmc.h:1.1.1.1 Thu Jun 9 05:07:58 2016
+++ xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common/xf86xvmc.h Tue Jan 1 21:55:40 2019
@@ -129,7 +129,7 @@ typedef void (*xf86XvMCDestroySubpicture
typedef struct {
- char *name;
+ const char *name;
int num_surfaces;
XF86MCSurfaceInfoPtr *surfaces;
int num_subpictures;
Index: xsrc/external/mit/xorg-server.old/dist/hw/xfree86/modes/xf86Crtc.c
diff -u xsrc/external/mit/xorg-server.old/dist/hw/xfree86/modes/xf86Crtc.c:1.1.1.1
CVS commit: src/sys/arch/luna68k/stand/boot
Module Name:src
Committed By: christos
Date: Wed Jan 2 00:50:02 UTC 2019
Modified Files:
src/sys/arch/luna68k/stand/boot: Makefile
Log Message:
use the right version of ELF2AOUT
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/luna68k/stand/boot/Makefile
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/luna68k/stand/boot/Makefile
diff -u src/sys/arch/luna68k/stand/boot/Makefile:1.15 src/sys/arch/luna68k/stand/boot/Makefile:1.16
--- src/sys/arch/luna68k/stand/boot/Makefile:1.15 Thu Sep 27 23:51:34 2018
+++ src/sys/arch/luna68k/stand/boot/Makefile Tue Jan 1 19:50:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2018/09/28 03:51:34 isaki Exp $
+# $NetBSD: Makefile,v 1.16 2019/01/02 00:50:02 christos Exp $
# @(#)Makefile 8.2 (Berkeley) 8/15/93
NOMAN= # defined
@@ -80,7 +80,7 @@ LIBS= ${SALIB} ${ZLIB} ${KERNLIB}
${PROG}: ${LDSCRIPT} ${OBJS} ${LIBS}
${_MKTARGET_LINK}
${LD} ${LINKFORMAT} -x -o ${PROG}.elf ${OBJS} ${LIBS}
- ${ELF2AOUT} ${PROG}.elf ${PROG}.aout
+ ${M68K_ELF2AOUT} ${PROG}.elf ${PROG}.aout
mv ${PROG}.aout ${PROG}
CLEANFILES+= ${PROG}.aout ${PROG}.elf
CVS commit: src/sys/arch/x68k/stand/boot
Module Name:src
Committed By: christos
Date: Wed Jan 2 00:48:13 UTC 2019
Modified Files:
src/sys/arch/x68k/stand/boot: Makefile
Log Message:
use the right version of ELF2AOUT
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/x68k/stand/boot/Makefile
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/x68k/stand/boot/Makefile
diff -u src/sys/arch/x68k/stand/boot/Makefile:1.29 src/sys/arch/x68k/stand/boot/Makefile:1.30
--- src/sys/arch/x68k/stand/boot/Makefile:1.29 Mon Dec 31 14:25:46 2018
+++ src/sys/arch/x68k/stand/boot/Makefile Tue Jan 1 19:48:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2018/12/31 19:25:46 christos Exp $
+# $NetBSD: Makefile,v 1.30 2019/01/02 00:48:13 christos Exp $
NOMAN= # defined
@@ -55,7 +55,7 @@ ${PROG}: ${OBJS} ${LDLIBS}
${_MKTARGET_LINK}
${LD} ${LINKFLAGS} -o ${PROG}.sym ${OBJS} ${LDLIBS}
${STRIP} ${PROG}.sym -o ${PROG}.strip
- ${ELF2AOUT} ${PROG}.strip ${PROG}
+ ${M68K_ELF2AOUT} ${PROG}.strip ${PROG}
CLEANFILES+= ${PROG}.sym ${PROG}.strip
CVS commit: src/distrib/sets/lists/xcomp
Module Name:src Committed By: christos Date: Wed Jan 2 00:46:34 UTC 2019 Modified Files: src/distrib/sets/lists/xcomp: mi Log Message: more headers only in 120 To generate a diff of this commit: cvs rdiff -u -r1.200 -r1.201 src/distrib/sets/lists/xcomp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/xcomp/mi diff -u src/distrib/sets/lists/xcomp/mi:1.200 src/distrib/sets/lists/xcomp/mi:1.201 --- src/distrib/sets/lists/xcomp/mi:1.200 Mon Dec 31 06:59:23 2018 +++ src/distrib/sets/lists/xcomp/mi Tue Jan 1 19:46:34 2019 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.200 2018/12/31 11:59:23 mrg Exp $ +# $NetBSD: mi,v 1.201 2019/01/02 00:46:34 christos Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -837,7 +837,7 @@ ./usr/X11R7/include/xorg/glamor.h -unknown- xorg,xorg_server_ver=120 ./usr/X11R7/include/xorg/globals.h -unknown- xorg ./usr/X11R7/include/xorg/glx_extinit.h -unknown- xorg,xorg_server_ver=120 -./usr/X11R7/include/xorg/glxvndabi.h -unknown- xorg +./usr/X11R7/include/xorg/glxvndabi.h -unknown- xorg,xorg_server_ver=120 ./usr/X11R7/include/xorg/glyphstr.h -unknown- xorg ./usr/X11R7/include/xorg/hotplug.h -unknown- xorg ./usr/X11R7/include/xorg/i2c_def.h -unknown- xorg @@ -928,7 +928,7 @@ ./usr/X11R7/include/xorg/vbeModes.h -unknown- xorg ./usr/X11R7/include/xorg/version-config.h -unknown- xorg ./usr/X11R7/include/xorg/vgaHW.h -unknown- xorg -./usr/X11R7/include/xorg/vndserver.h -unknown- xorg +./usr/X11R7/include/xorg/vndserver.h -unknown- xorg,xorg_server_ver=120 ./usr/X11R7/include/xorg/window.h -unknown- xorg ./usr/X11R7/include/xorg/windowstr.h -unknown- xorg ./usr/X11R7/include/xorg/xaa.h-unknown- xorg,xorg_server_ver=110 @@ -944,7 +944,7 @@ ./usr/X11R7/include/xorg/xf86Crtc.h -unknown- xorg ./usr/X11R7/include/xorg/xf86Cursor.h -unknown- xorg ./usr/X11R7/include/xorg/xf86DDC.h -unknown- xorg -./usr/X11R7/include/xorg/xf86MatchDrivers.h -unknown- xorg +./usr/X11R7/include/xorg/xf86MatchDrivers.h -unknown- xorg,xorg_server_ver=120 ./usr/X11R7/include/xorg/xf86Modes.h -unknown- xorg ./usr/X11R7/include/xorg/xf86Module.h -unknown- xorg ./usr/X11R7/include/xorg/xf86OSmouse.h -unknown- obsolete @@ -988,7 +988,7 @@ ./usr/X11R7/include/xorg/xorg-server.h -unknown- xorg ./usr/X11R7/include/xorg/xorgVersion.h -unknown- xorg ./usr/X11R7/include/xorg/xserver-properties.h -unknown- xorg -./usr/X11R7/include/xorg/xserver_poll.h -unknown- xorg +./usr/X11R7/include/xorg/xserver_poll.h -unknown- xorg,xorg_server_ver=120 ./usr/X11R7/include/xorg/xsha1.h -unknown- xorg ./usr/X11R7/include/xorg/xvdix.h -unknown- xorg ./usr/X11R7/include/xorg/xvmcext.h -unknown- xorg
CVS commit: src/distrib
Module Name:src
Committed By: christos
Date: Tue Jan 1 19:09:13 UTC 2019
Modified Files:
src/distrib/ews4800mips/floppies/instkernel: Makefile
src/distrib/mipsco/instkernel: Makefile
src/distrib/pmax/instkernel: Makefile
src/distrib/sgimips/instkernel: Makefile
Log Message:
Rename ELF2ECOFF -> MIPS_ELF2ECOFF
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/distrib/ews4800mips/floppies/instkernel/Makefile
cvs rdiff -u -r1.17 -r1.18 src/distrib/mipsco/instkernel/Makefile
cvs rdiff -u -r1.40 -r1.41 src/distrib/pmax/instkernel/Makefile
cvs rdiff -u -r1.13 -r1.14 src/distrib/sgimips/instkernel/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/ews4800mips/floppies/instkernel/Makefile
diff -u src/distrib/ews4800mips/floppies/instkernel/Makefile:1.7 src/distrib/ews4800mips/floppies/instkernel/Makefile:1.8
--- src/distrib/ews4800mips/floppies/instkernel/Makefile:1.7 Tue Sep 20 16:55:11 2016
+++ src/distrib/ews4800mips/floppies/instkernel/Makefile Tue Jan 1 14:09:12 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2016/09/20 20:55:11 christos Exp $
+# $NetBSD: Makefile,v 1.8 2019/01/01 19:09:12 christos Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -20,7 +20,7 @@ all realall: ${BOOT_RAMDISK}.gz
${BOOT_RAMDISK}.gz: netbsd-RAMDISK.gz ${DESTDIR}/usr/mdec/boot_kernel.gz
gunzip -c ${DESTDIR}/usr/mdec/boot_kernel.gz > ${BOOT_RAMDISK}.tmp
${TOOL_MDSETIMAGE} -v ${BOOT_RAMDISK}.tmp netbsd-RAMDISK.gz
- ${ELF2ECOFF} ${BOOT_RAMDISK}.tmp ${BOOT_RAMDISK}.coff
+ ${MIPS_ELF2ECOFF} ${BOOT_RAMDISK}.tmp ${BOOT_RAMDISK}.coff
${TOOL_GZIP_N} -9c ${BOOT_RAMDISK}.coff > ${.TARGET}
CLEANFILES+= ${BOOT_RAMDISK}.tmp ${BOOT_RAMDISK}.coff ${BOOT_RAMDISK}.gz
Index: src/distrib/mipsco/instkernel/Makefile
diff -u src/distrib/mipsco/instkernel/Makefile:1.17 src/distrib/mipsco/instkernel/Makefile:1.18
--- src/distrib/mipsco/instkernel/Makefile:1.17 Sat Feb 20 11:42:33 2016
+++ src/distrib/mipsco/instkernel/Makefile Tue Jan 1 14:09:12 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2016/02/20 16:42:33 christos Exp $
+# $NetBSD: Makefile,v 1.18 2019/01/01 19:09:12 christos Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -25,7 +25,7 @@ MDSETTARGETS= RAMDISK ${RAMDISK} netbsd
MDSET_RELEASEDIR= binary/kernel
MDSET_SUFFIXES.netbsd-INSTALL= ecoff create-ecoff
-create-ecoff= ${ELF2ECOFF} ${.TARGET:R} ${.TARGET}
+create-ecoff= ${MIPS_ELF2ECOFF} ${.TARGET:R} ${.TARGET}
IMAGE_RELEASEDIR= installation/diskimage
Index: src/distrib/pmax/instkernel/Makefile
diff -u src/distrib/pmax/instkernel/Makefile:1.40 src/distrib/pmax/instkernel/Makefile:1.41
--- src/distrib/pmax/instkernel/Makefile:1.40 Thu Feb 22 02:21:10 2018
+++ src/distrib/pmax/instkernel/Makefile Tue Jan 1 14:09:12 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2018/02/22 07:21:10 mrg Exp $
+# $NetBSD: Makefile,v 1.41 2019/01/01 19:09:12 christos Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -26,7 +26,7 @@ MDSET_RELEASEDIR= binary/kernel
.if ${MACHINE_ARCH} == "mipsel"
MDSET_SUFFIXES.netbsd-INSTALL${SFX}= ecoff create-ecoff
-create-ecoff=${ELF2ECOFF} ${.TARGET:R} ${.TARGET}
+create-ecoff= ${MIPS_ELF2ECOFF} ${.TARGET:R} ${.TARGET}
.endif
IMAGE_RELEASEDIR= installation/diskimage
Index: src/distrib/sgimips/instkernel/Makefile
diff -u src/distrib/sgimips/instkernel/Makefile:1.13 src/distrib/sgimips/instkernel/Makefile:1.14
--- src/distrib/sgimips/instkernel/Makefile:1.13 Sun Sep 2 12:41:42 2018
+++ src/distrib/sgimips/instkernel/Makefile Tue Jan 1 14:09:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2018/09/02 16:41:42 tsutsui Exp $
+# $NetBSD: Makefile,v 1.14 2019/01/01 19:09:13 christos Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -30,7 +30,7 @@ MDSETTARGETS= INSTALL${NX}_IP2x ${RAMDIS
MDSET_RELEASEDIR= binary/kernel
MDSET_SUFFIXES.netbsd-INSTALL${NX}_IP2x=ecoff create-ecoff
-create-ecoff= ${ELF2ECOFF} ${.TARGET:R} ${.TARGET}
+create-ecoff= ${MIPS_ELF2ECOFF} ${.TARGET:R} ${.TARGET}
IMAGE_RELEASEDIR= installation/diskimage
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Tue Jan 1 19:06:38 UTC 2019
Modified Files:
src/share/mk: bsd.README bsd.sys.mk
Log Message:
document the elf2foo tools.
The bsd.sys.mk tools are un-prefixed, since the "right" version is installed
for the platform, as opposed to the tools ones which should be able to
co-exist.
To generate a diff of this commit:
cvs rdiff -u -r1.386 -r1.387 src/share/mk/bsd.README
cvs rdiff -u -r1.288 -r1.289 src/share/mk/bsd.sys.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.386 src/share/mk/bsd.README:1.387
--- src/share/mk/bsd.README:1.386 Thu Nov 15 04:23:50 2018
+++ src/share/mk/bsd.README Tue Jan 1 14:06:38 2019
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.386 2018/11/15 09:23:50 martin Exp $
+# $NetBSD: bsd.README,v 1.387 2019/01/01 19:06:38 christos Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD
@@ -865,7 +865,9 @@ TOOL_AMIGAAOUT2BB aout to Amiga bootbloc
TOOL_AMIGAELF2BB ELF to Amiga bootblock converter. [amiga-elf2bb]
-TOOL_AMIGATXLT Amige assembly language format translator. [amiga-txlt]
+TOOL_AMIGATXLT Amiga assembly language format translator. [amiga-txlt]
+
+TOOL_ARMELF2AOUT ELF to a.out executable converter [arm-elf2aout}
TOOL_ASN1_COMPILE ASN1 compiler. [asn1_compile]
@@ -928,6 +930,8 @@ TOOL_JOIN Relational database operator.
TOOL_M4 M4 macro language processor. [m4]
+TOOL_M68KELF2AOUT ELF to a.out executable converter [m68k-elf2aout}
+
TOOL_MACPPCFIXCOFF Fix up xcoff headers for macppc. [macppc-fixcoff]
TOOL_MAKEFS Create file system image from directory tree. [makefs]
@@ -1974,6 +1978,8 @@ AR Create, modify, and extract from arc
ARFLAGS Options to ${AR}. [rl]
+ARM_ELF2AOUT Convert ELF-format executable to a.out. [elf2aout]
+
AS Assembler. [as]
AFLAGS Options to ${CC} when compiling or linking .s or .S
@@ -2000,7 +2006,9 @@ CXX C++ compiler. [c++]
CXXFLAGS Options to ${CXX}. [${CFLAGS}]
-ELF2ECOFF Convert ELF-format executable to ECOFF. [elf2ecoff]
+M68K_ELF2AOUT Convert ELF-format executable to a.out. [elf2aout]
+
+MIPS_ELF2ECOFF Convert ELF-format executable to ECOFF. [elf2ecoff]
FC Fortran compiler. [f77]
Index: src/share/mk/bsd.sys.mk
diff -u src/share/mk/bsd.sys.mk:1.288 src/share/mk/bsd.sys.mk:1.289
--- src/share/mk/bsd.sys.mk:1.288 Mon Dec 31 08:31:25 2018
+++ src/share/mk/bsd.sys.mk Tue Jan 1 14:06:38 2019
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sys.mk,v 1.288 2018/12/31 13:31:25 christos Exp $
+# $NetBSD: bsd.sys.mk,v 1.289 2019/01/01 19:06:38 christos Exp $
#
# Build definitions used for NetBSD source tree builds.
@@ -247,9 +247,9 @@ PIE_LDFLAGS?= -pie ${${ACTIVE_CC}
PIE_AFLAGS?= -fPIE
.endif
-ARM_ELF2AOUT?= arm-elf2aout
-M68K_ELF2AOUT?= m68k-elf2aout
-MIPS_ELF2ECOFF?= mips-elf2ecoff
+ARM_ELF2AOUT?= elf2aout
+M68K_ELF2AOUT?= elf2aout
+MIPS_ELF2ECOFF?= elf2ecoff
MKDEP?= mkdep
MKDEPCXX?= mkdep
OBJCOPY?= objcopy
CVS commit: src
Module Name:src Committed By: maya Date: Tue Jan 1 18:46:09 UTC 2019 Modified Files: src/distrib/sets/lists/base: mi src/distrib/sets/lists/comp: mi src/etc/mtree: NetBSD.dist.base src/external/bsd/llvm/include: Makefile Removed Files: src/external/bsd/llvm/include/llvm: Makefile Makefile.inc src/external/bsd/llvm/include/llvm-c: Makefile Makefile.inc src/external/bsd/llvm/include/llvm-c/Transforms: Makefile Makefile.inc src/external/bsd/llvm/include/llvm-c/Transforms/AggressiveInstCombine: Makefile Makefile.inc src/external/bsd/llvm/include/llvm-c/Transforms/IPO: Makefile Makefile.inc src/external/bsd/llvm/include/llvm-c/Transforms/InstCombine: Makefile Makefile.inc src/external/bsd/llvm/include/llvm-c/Transforms/Instrumentation: Makefile Makefile.inc src/external/bsd/llvm/include/llvm-c/Transforms/Scalar: Makefile Makefile.inc src/external/bsd/llvm/include/llvm-c/Transforms/Utils: Makefile Makefile.inc src/external/bsd/llvm/include/llvm-c/Transforms/Vectorize: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/ADT: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/Analysis: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/AsmParser: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/BinaryFormat: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/BinaryFormat/ELFRelocs: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/Bitcode: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/CodeGen: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/Config: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/DebugInfo: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/DebugInfo/CodeView: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/Demangle: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/ExecutionEngine: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/FuzzMutate: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/IR: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/IRReader: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/LTO: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/LineEditor: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/Linker: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/MC: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/Object: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/ObjectYAML: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/Option: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/Passes: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/ProfileData: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/ProfileData/Coverage: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/Support: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/TableGen: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/Target: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/Transforms: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/Transforms/AggressiveInstCombine: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/Transforms/IPO: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/Transforms/InstCombine: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/Transforms/Instrumentation: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/Transforms/Scalar: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/Transforms/Utils: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/Transforms/Vectorize: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/WindowsManifest: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/WindowsResource: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/XRay: Makefile Makefile.inc Log Message: Revert installing llvm headers. To generate a diff of this commit: cvs rdiff -u -r1.1197 -r1.1198 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.2247 -r1.2248 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.183 -r1.184 src/etc/mtree/NetBSD.dist.base cvs rdiff -u -r1.44 -r1.45 src/external/bsd/llvm/include/Makefile cvs rdiff -u -r1.1 -r0 src/external/bsd/llvm/include/llvm/Makefile \ src/external/bsd/llvm/include/llvm/Makefile.inc cvs rdiff -u -r1.1 -r0 src/external/bsd/llvm/include/llvm-c/Makefile \ src/external/bsd/llvm/include/llvm-c/Makefile.inc
CVS commit: src/usr.bin/elf2aout
Module Name:src
Committed By: martin
Date: Tue Jan 1 14:01:46 UTC 2019
Modified Files:
src/usr.bin/elf2aout: Makefile
Log Message:
Match all arm (and simplify powerpc conditionals)
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/elf2aout/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/elf2aout/Makefile
diff -u src/usr.bin/elf2aout/Makefile:1.12 src/usr.bin/elf2aout/Makefile:1.13
--- src/usr.bin/elf2aout/Makefile:1.12 Mon Dec 31 13:32:05 2018
+++ src/usr.bin/elf2aout/Makefile Tue Jan 1 14:01:46 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2018/12/31 13:32:05 christos Exp $
+# $NetBSD: Makefile,v 1.13 2019/01/01 14:01:46 martin Exp $
# from: @(#)Makefile 5.4 (Berkeley) 5/11/90
.include # for MACHINE_CPU
@@ -7,9 +7,8 @@ WARNS=6
# Build ELF to aout tools on m68k/earmv4/powerpc,
# for kernels with old bootblocks.
.if (${MACHINE_CPU} == "m68k" || \
- ${MACHINE_ARCH} == "arm" || \
- ${MACHINE_ARCH} == "powerpc" || \
- ${MACHINE_ARCH} == "powerpc64")
+ ${MACHINE_CPU} == "arm" || \
+ ${MACHINE_CPU} == "powerpc" )
PROG= elf2aout
.endif
CVS commit: src/external/cddl/osnet/dist/uts/common/fs/zfs
Module Name:src
Committed By: hannken
Date: Tue Jan 1 10:08:42 UTC 2019
Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs: zfs_vnops.c
Log Message:
As already noted in XXX comment do a zil_commit() on reclaim.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.39 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.40
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.39 Thu Dec 13 10:20:51 2018
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c Tue Jan 1 10:08:42 2019
@@ -5663,11 +5663,6 @@ zfs_netbsd_reclaim(void *v)
/*
* Process a deferred atime update.
*/
- /*
- * XXXNETBSD I don't think this actually works.
- * We are dirtying the znode again after the vcache layer cleaned it,
- * so we would need to zil_commit() again here.
- */
if (zp->z_atime_dirty && zp->z_unlinked == 0) {
dmu_tx_t *tx = dmu_tx_create(zfsvfs->z_os);
@@ -5684,6 +5679,8 @@ zfs_netbsd_reclaim(void *v)
}
}
+ zil_commit(zfsvfs->z_log, zp->z_id);
+
if (zp->z_sa_hdl == NULL)
zfs_znode_free(zp);
else
CVS commit: src/external/cddl/osnet/dist/uts/common/fs/zfs
Module Name:src
Committed By: hannken
Date: Tue Jan 1 10:09:27 UTC 2019
Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs: zfs_vnops.c
Log Message:
Cannot use ZFS_ENTER() / ZFS_EXIT() as zfs_netbsd_putpages() is used
during vnode reclaim.
Add missing protection with fstrans.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.40 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.41
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.40 Tue Jan 1 10:08:42 2019
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c Tue Jan 1 10:09:26 2019
@@ -84,6 +84,7 @@
#include
#include
#include
+#include
uint_t zfs_putpage_key;
#endif
@@ -5972,9 +5973,6 @@ zfs_netbsd_putpages(void *v)
bool async = (flags & PGO_SYNCIO) == 0;
bool cleaning = (flags & PGO_CLEANIT) != 0;
- ZFS_ENTER(zfsvfs);
- ZFS_VERIFY_ZP(zp);
-
if (cleaning) {
ASSERT((offlo & PAGE_MASK) == 0 && (offhi & PAGE_MASK) == 0);
ASSERT(offlo < offhi || offhi == 0);
@@ -5983,25 +5981,38 @@ zfs_netbsd_putpages(void *v)
else
len = offhi - offlo;
mutex_exit(vp->v_interlock);
+ if (curlwp == uvm.pagedaemon_lwp) {
+ error = fstrans_start_nowait(vp->v_mount);
+ if (error)
+return error;
+ } else {
+ vfs_t *mp = vp->v_mount;
+ fstrans_start(mp);
+ if (vp->v_mount != mp) {
+fstrans_done(mp);
+ASSERT(!vn_has_cached_data(vp));
+return 0;
+ }
+ }
rl = zfs_range_lock(zp, offlo, len, RL_WRITER);
mutex_enter(vp->v_interlock);
tsd_set(zfs_putpage_key, );
}
error = genfs_putpages(v);
- if (rl) {
+ if (cleaning) {
tsd_set(zfs_putpage_key, NULL);
zfs_range_unlock(rl);
- }
- /*
- * Only zil_commit() if we cleaned something.
- * This avoids deadlock if we're called from zfs_netbsd_setsize().
- */
+ /*
+ * Only zil_commit() if we cleaned something. This avoids
+ * deadlock if we're called from zfs_netbsd_setsize().
+ */
- if (cleaned)
- if (!async || zfsvfs->z_os->os_sync == ZFS_SYNC_ALWAYS)
- zil_commit(zfsvfs->z_log, zp->z_id);
- ZFS_EXIT(zfsvfs);
+ if (cleaned)
+ if (!async || zfsvfs->z_os->os_sync == ZFS_SYNC_ALWAYS)
+ zil_commit(zfsvfs->z_log, zp->z_id);
+ fstrans_done(vp->v_mount);
+ }
return error;
}
CVS commit: src/external/cddl/osnet/dist/uts/common/fs/zfs
Module Name:src
Committed By: hannken
Date: Tue Jan 1 10:08:01 UTC 2019
Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs: zfs_ioctl.c
zfs_vfsops.c zfs_znode.c
src/external/cddl/osnet/dist/uts/common/fs/zfs/sys: zfs_znode.h
Log Message:
Cannot hold zfs object across call to vcache_get() as it might
deadlock with another reclaim.
Add vfs operation zfs_newvnode() to create a new zfs node and
hold the zfs object in zfs_loadvnode() and zfs_newvnode() only.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c
cvs rdiff -u -r1.17 -r1.18 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vfsops.c
cvs rdiff -u -r1.23 -r1.24 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c
cvs rdiff -u -r1.8 -r1.9 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/zfs_znode.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c:1.13 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c:1.14
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c:1.13 Mon Aug 20 06:47:16 2018
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c Tue Jan 1 10:08:01 2019
@@ -7120,7 +7120,6 @@ zfs_modcmd(modcmd_t cmd, void *arg)
uint64_t availrmem;
extern struct vfsops zfs_vfsops;
- extern uint_t zfs_loadvnode_key;
extern uint_t zfs_putpage_key;
switch (cmd) {
@@ -7144,7 +7143,6 @@ zfs_modcmd(modcmd_t cmd, void *arg)
tsd_create(_fsyncer_key, NULL);
tsd_create(_tsd_key, rrw_tsd_destroy);
tsd_create(_allow_log_key, zfs_allow_log_destroy);
- tsd_create(_loadvnode_key, zfs_loadvnode_destroy);
tsd_create(_putpage_key, NULL);
spa_init(FREAD | FWRITE);
@@ -7179,7 +7177,6 @@ attacherr:
spa_fini();
tsd_destroy(_putpage_key);
- tsd_destroy(_loadvnode_key);
tsd_destroy(_fsyncer_key);
tsd_destroy(_tsd_key);
tsd_destroy(_allow_log_key);
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vfsops.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vfsops.c:1.17 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vfsops.c:1.18
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vfsops.c:1.17 Sun Sep 16 06:09:01 2018
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vfsops.c Tue Jan 1 10:08:01 2019
@@ -163,6 +163,7 @@ struct vfsops zfs_vfsops = {
.vfs_sync = zfs_netbsd_sync,
.vfs_vget = zfs_vget,
.vfs_loadvnode = zfs_loadvnode,
+ .vfs_newvnode = zfs_newvnode,
.vfs_init = zfs_init,
.vfs_done = zfs_fini,
.vfs_start = (void *)nullop,
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c:1.23 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c:1.24
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c:1.23 Thu Dec 6 09:58:52 2018
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c Tue Jan 1 10:08:01 2019
@@ -60,15 +60,6 @@ extern int (**zfs_vnodeop_p)(void *);
extern int (**zfs_fifoop_p)(void *);
extern int (**zfs_specop_p)(void *);
-struct zfs_loadvnode_args {
- dmu_buf_t *db;
- int blksz;
- dmu_object_type_t obj_type;
- void *sa_hdl;
-};
-
-uint_t zfs_loadvnode_key;
-
#endif
#endif /* _KERNEL */
@@ -621,6 +612,7 @@ zfs_vnode_forget(vnode_t *vp)
vgone(vp);
vput(vp);
}
+#endif /* __FreeBSD__ */
/*
* Construct a new znode/vnode and intialize.
@@ -630,11 +622,18 @@ zfs_vnode_forget(vnode_t *vp)
* return the znode
*/
static znode_t *
+#ifdef __NetBSD__
+zfs_znode_alloc(zfsvfs_t *zfsvfs, dmu_buf_t *db, int blksz,
+dmu_object_type_t obj_type, sa_handle_t *hdl, vnode_t *vp)
+#else
zfs_znode_alloc(zfsvfs_t *zfsvfs, dmu_buf_t *db, int blksz,
dmu_object_type_t obj_type, sa_handle_t *hdl)
+#endif
{
znode_t *zp;
+#ifndef __NetBSD__
vnode_t *vp;
+#endif
uint64_t mode;
uint64_t parent;
sa_bulk_attr_t bulk[9];
@@ -643,6 +642,7 @@ zfs_znode_alloc(zfsvfs_t *zfsvfs, dmu_bu
zp = kmem_cache_alloc(znode_cache, KM_SLEEP);
+#ifndef __NetBSD__
KASSERT(curthread->td_vp_reserv > 0,
("zfs_znode_alloc: getnewvnode without any vnodes reserved"));
error = getnewvnode("zfs", zfsvfs->z_parent->z_vfs, _vnodeops, );
@@ -650,6 +650,7 @@ zfs_znode_alloc(zfsvfs_t *zfsvfs, dmu_bu
kmem_cache_free(znode_cache, zp);
return (NULL);
}
+#endif
zp->z_vnode = vp;
vp->v_data = zp;
@@ -669,6 +670,12 @@ zfs_znode_alloc(zfsvfs_t *zfsvfs, dmu_bu
zp->z_seq = 0x7A4653;
zp->z_sync_cnt = 0;
+#ifdef __NetBSD__
+ vp->v_op = zfs_vnodeop_p;
+ vp->v_tag = VT_ZFS;
+ zp->z_lockf = NULL;
+#endif
+
vp = ZTOV(zp);
zfs_znode_sa_init(zfsvfs, zp, db, obj_type, hdl);
@@ -692,7 +699,9 @@ zfs_znode_alloc(zfsvfs_t *zfsvfs, dmu_bu
if (sa_bulk_lookup(zp->z_sa_hdl, bulk,
CVS commit: src
Module Name:src Committed By: hannken Date: Tue Jan 1 10:06:55 UTC 2019 Modified Files: src/share/man/man9: vfsops.9 vnode.9 src/sys/fs/tmpfs: tmpfs_subr.c tmpfs_vfsops.c src/sys/fs/udf: udf_subr.c src/sys/kern: vfs_subr.c vfs_vnode.c src/sys/miscfs/deadfs: dead_vfsops.c src/sys/sys: mount.h param.h vnode.h src/sys/ufs/ext2fs: ext2fs_vfsops.c ext2fs_vnops.c src/sys/ufs/ffs: ffs_vfsops.c ffs_wapbl.c src/sys/ufs/lfs: lfs_rfw.c lfs_vfsops.c lfs_vnops.c src/sys/ufs/ufs: ufs_vnops.c Log Message: Add "void *extra" argument to vcache_new() so a file system may pass more information about the file to create. Welcome to 8.99.30 To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 src/share/man/man9/vfsops.9 cvs rdiff -u -r1.81 -r1.82 src/share/man/man9/vnode.9 cvs rdiff -u -r1.103 -r1.104 src/sys/fs/tmpfs/tmpfs_subr.c cvs rdiff -u -r1.73 -r1.74 src/sys/fs/tmpfs/tmpfs_vfsops.c cvs rdiff -u -r1.144 -r1.145 src/sys/fs/udf/udf_subr.c cvs rdiff -u -r1.470 -r1.471 src/sys/kern/vfs_subr.c cvs rdiff -u -r1.100 -r1.101 src/sys/kern/vfs_vnode.c cvs rdiff -u -r1.8 -r1.9 src/sys/miscfs/deadfs/dead_vfsops.c cvs rdiff -u -r1.233 -r1.234 src/sys/sys/mount.h cvs rdiff -u -r1.574 -r1.575 src/sys/sys/param.h cvs rdiff -u -r1.280 -r1.281 src/sys/sys/vnode.h cvs rdiff -u -r1.212 -r1.213 src/sys/ufs/ext2fs/ext2fs_vfsops.c cvs rdiff -u -r1.128 -r1.129 src/sys/ufs/ext2fs/ext2fs_vnops.c cvs rdiff -u -r1.360 -r1.361 src/sys/ufs/ffs/ffs_vfsops.c cvs rdiff -u -r1.43 -r1.44 src/sys/ufs/ffs/ffs_wapbl.c cvs rdiff -u -r1.33 -r1.34 src/sys/ufs/lfs/lfs_rfw.c cvs rdiff -u -r1.363 -r1.364 src/sys/ufs/lfs/lfs_vfsops.c cvs rdiff -u -r1.322 -r1.323 src/sys/ufs/lfs/lfs_vnops.c cvs rdiff -u -r1.241 -r1.242 src/sys/ufs/ufs/ufs_vnops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/vfsops.9 diff -u src/share/man/man9/vfsops.9:1.48 src/share/man/man9/vfsops.9:1.49 --- src/share/man/man9/vfsops.9:1.48 Mon Jul 3 21:28:48 2017 +++ src/share/man/man9/vfsops.9 Tue Jan 1 10:06:54 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: vfsops.9,v 1.48 2017/07/03 21:28:48 wiz Exp $ +.\" $NetBSD: vfsops.9,v 1.49 2019/01/01 10:06:54 hannken Exp $ .\" .\" Copyright (c) 2001 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd July 12, 2015 +.Dd January 1, 2019 .Dt VFSOPS 9 .Os .Sh NAME @@ -72,7 +72,7 @@ .Ft int .Fn VFS_LOADVNODE "struct mount *mp" "struct vnode *vp" "const void *key" "size_t key_len" "const void **new_key" .Ft int -.Fn VFS_NEWVNODE "struct mount *mp" "struct vnode *dvp" "struct vnode *vp" "struct vattr *vap" "kauth_cred_t cred" "size_t *key_len" "const void **new_key" +.Fn VFS_NEWVNODE "struct mount *mp" "struct vnode *dvp" "struct vnode *vp" "struct vattr *vap" "kauth_cred_t cred" "void *extra" "size_t *key_len" "const void **new_key" .Ft int .Fn VFS_FHTOVP "struct mount *mp" "struct fid *fhp" "struct vnode **vpp" .Ft int @@ -378,6 +378,10 @@ The argument .Fa cred holds the credentials for the file to create. .Pp +The argument +.Fa extra +allows the caller to pass more information about the file to create. +.Pp The key for the file is returned in the addresses specified by .Fa key_len and Index: src/share/man/man9/vnode.9 diff -u src/share/man/man9/vnode.9:1.81 src/share/man/man9/vnode.9:1.82 --- src/share/man/man9/vnode.9:1.81 Mon Jul 3 21:28:48 2017 +++ src/share/man/man9/vnode.9 Tue Jan 1 10:06:54 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: vnode.9,v 1.81 2017/07/03 21:28:48 wiz Exp $ +.\" $NetBSD: vnode.9,v 1.82 2019/01/01 10:06:54 hannken Exp $ .\" .\" Copyright (c) 2001, 2005, 2006 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd May 28, 2017 +.Dd January 1, 2019 .Dt VNODE 9 .Os .Sh NAME @@ -76,7 +76,7 @@ .Ft int .Fn vcache_get "struct mount *mp" "const void *key" "size_t key_len" "struct vnode **vpp" .Ft int -.Fn vcache_new "struct mount *mp" "struct vnode *dvp" "struct vattr *vap" "kauth_cred_t cred" "struct vnode **vpp" +.Fn vcache_new "struct mount *mp" "struct vnode *dvp" "struct vattr *vap" "kauth_cred_t cred" "void *extra" "struct vnode **vpp" .Ft int .Fn vcache_rekey_enter "struct mount *mp" "struct vnode *vp" "const void *old_key" "size_t old_key_len" "const void *new_key" "size_t new_key_len" .Ft void @@ -578,6 +578,10 @@ The argument .Fa cred holds the credentials for the file to create. .Pp +The argument +.Fa extra +allows the caller to pass more information about the file to create. +.Pp If a vnode is successfully created zero is returned, otherwise an appropriate error code is returned. .It Fn
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: maya Date: Tue Jan 1 08:09:30 UTC 2019 Modified Files: src/sys/arch/amd64/conf: GENERIC Log Message: Add commented out amdgpu. (Builds, untested on hardware) To generate a diff of this commit: cvs rdiff -u -r1.514 -r1.515 src/sys/arch/amd64/conf/GENERIC 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/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.514 src/sys/arch/amd64/conf/GENERIC:1.515 --- src/sys/arch/amd64/conf/GENERIC:1.514 Tue Dec 25 11:56:14 2018 +++ src/sys/arch/amd64/conf/GENERIC Tue Jan 1 08:09:30 2019 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.514 2018/12/25 11:56:14 mlelstv Exp $ +# $NetBSD: GENERIC,v 1.515 2019/01/01 08:09:30 maya Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.514 $" +#ident "GENERIC-$Revision: 1.515 $" maxusers 64 # estimated number of users @@ -436,6 +436,9 @@ intelfb* at intelfbbus? radeon* at pci? dev ? function ? radeondrmkmsfb* at radeonfbbus? +#amdgpu* at pci? dev ? function ? +#amdgpufb* at amdgpufbbus? + nouveau* at pci? dev ? function ? nouveaufb* at nouveaufbbus?
CVS commit: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu
Module Name:src
Committed By: maya
Date: Tue Jan 1 08:07:47 UTC 2019
Modified Files:
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu: amdgpu_atombios_dp.c
amdgpu_uvd.c amdgpu_vce.c
Log Message:
Fix clang build by using hhx to print u8 and x to print unsigned.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_dp.c
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd.c \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_vce.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/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_dp.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_dp.c:1.1 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_dp.c:1.2
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_dp.c:1.1 Mon Aug 27 14:10:14 2018
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_dp.c Tue Jan 1 08:07:47 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_atombios_dp.c,v 1.1 2018/08/27 14:10:14 riastradh Exp $ */
+/* $NetBSD: amdgpu_atombios_dp.c,v 1.2 2019/01/01 08:07:47 maya Exp $ */
/*
* Copyright 2007-8 Advanced Micro Devices, Inc.
@@ -27,7 +27,7 @@
* Jerome Glisse
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_atombios_dp.c,v 1.1 2018/08/27 14:10:14 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_atombios_dp.c,v 1.2 2019/01/01 08:07:47 maya Exp $");
#include
#include
@@ -333,11 +333,11 @@ static void amdgpu_atombios_dp_probe_oui
return;
if (drm_dp_dpcd_read(_connector->ddc_bus->aux, DP_SINK_OUI, buf, 3) == 3)
- DRM_DEBUG_KMS("Sink OUI: %02hx%02hx%02hx\n",
+ DRM_DEBUG_KMS("Sink OUI: %02hhx%02hhx%02hhx\n",
buf[0], buf[1], buf[2]);
if (drm_dp_dpcd_read(_connector->ddc_bus->aux, DP_BRANCH_OUI, buf, 3) == 3)
- DRM_DEBUG_KMS("Branch OUI: %02hx%02hx%02hx\n",
+ DRM_DEBUG_KMS("Branch OUI: %02hhx%02hhx%02hhx\n",
buf[0], buf[1], buf[2]);
}
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd.c:1.3 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd.c:1.3 Mon Aug 27 14:04:50 2018
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_uvd.c Tue Jan 1 08:07:47 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_uvd.c,v 1.3 2018/08/27 14:04:50 riastradh Exp $ */
+/* $NetBSD: amdgpu_uvd.c,v 1.4 2019/01/01 08:07:47 maya Exp $ */
/*
* Copyright 2011 Advanced Micro Devices, Inc.
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_uvd.c,v 1.3 2018/08/27 14:04:50 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_uvd.c,v 1.4 2019/01/01 08:07:47 maya Exp $");
#include
#include
@@ -159,7 +159,7 @@ int amdgpu_uvd_sw_init(struct amdgpu_dev
family_id = le32_to_cpu(hdr->ucode_version) & 0xff;
version_major = (le32_to_cpu(hdr->ucode_version) >> 24) & 0xff;
version_minor = (le32_to_cpu(hdr->ucode_version) >> 8) & 0xff;
- DRM_INFO("Found UVD firmware Version: %hu.%hu Family ID: %hu\n",
+ DRM_INFO("Found UVD firmware Version: %x.%x Family ID: %x\n",
version_major, version_minor, family_id);
adev->uvd.fw_version = ((version_major << 24) | (version_minor << 16) |
Index: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_vce.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_vce.c:1.3 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_vce.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_vce.c:1.3 Mon Aug 27 14:04:50 2018
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_vce.c Tue Jan 1 08:07:47 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_vce.c,v 1.3 2018/08/27 14:04:50 riastradh Exp $ */
+/* $NetBSD: amdgpu_vce.c,v 1.4 2019/01/01 08:07:47 maya Exp $ */
/*
* Copyright 2013 Advanced Micro Devices, Inc.
@@ -28,7 +28,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_vce.c,v 1.3 2018/08/27 14:04:50 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_vce.c,v 1.4 2019/01/01 08:07:47 maya Exp $");
#include
#include
@@ -144,7 +144,7 @@ int amdgpu_vce_sw_init(struct amdgpu_dev
version_major = (ucode_version >> 20) & 0xfff;
version_minor = (ucode_version >> 8) & 0xfff;
binary_id = ucode_version & 0xff;
- DRM_INFO("Found VCE firmware Version: %hhd.%hhd Binary ID: %hhd\n",
+ DRM_INFO("Found VCE firmware Version: %x.%x Binary ID: %x\n",
version_major, version_minor, binary_id);
adev->vce.fw_version = ((version_major << 24) | (version_minor << 16) |
(binary_id << 8));
