Date: Tue, 21 May 2019 01:56:26 +0000 (UTC) From: Enji Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r348029 - in user/ngie/bug-237403: stand/common stand/powerpc sys/arm/allwinner sys/arm/amlogic/aml8726 sys/arm/freescale/imx sys/arm/rockchip sys/arm/ti/am335x sys/compat/linuxkpi/comm... Message-ID: <201905210156.x4L1uQtE026938@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Tue May 21 01:56:26 2019 New Revision: 348029 URL: https://svnweb.freebsd.org/changeset/base/348029 Log: MFhead@r348028 Modified: user/ngie/bug-237403/stand/common/load_elf.c user/ngie/bug-237403/stand/powerpc/Makefile user/ngie/bug-237403/sys/arm/allwinner/a10_fb.c user/ngie/bug-237403/sys/arm/allwinner/a10_hdmi.c user/ngie/bug-237403/sys/arm/amlogic/aml8726/aml8726_wdt.c user/ngie/bug-237403/sys/arm/freescale/imx/imx6_ipu.c user/ngie/bug-237403/sys/arm/rockchip/rk30xx_wdog.c user/ngie/bug-237403/sys/arm/ti/am335x/am335x_lcd.c user/ngie/bug-237403/sys/arm/ti/am335x/tda19988.c user/ngie/bug-237403/sys/compat/linuxkpi/common/src/linux_compat.c user/ngie/bug-237403/sys/dev/drm2/ttm/ttm_page_alloc.c user/ngie/bug-237403/sys/dev/fb/creator.c user/ngie/bug-237403/sys/dev/fb/fbd.c user/ngie/bug-237403/sys/dev/hdmi/dwc_hdmi.c user/ngie/bug-237403/sys/dev/iscsi_initiator/iscsi.c user/ngie/bug-237403/sys/dev/mlx4/mlx4_en/mlx4_en_netdev.c user/ngie/bug-237403/sys/dev/mlx5/mlx5_en/mlx5_en_main.c user/ngie/bug-237403/sys/mips/atheros/ar531x/ar5315_wdog.c user/ngie/bug-237403/sys/mips/cavium/octeon_wdog.c user/ngie/bug-237403/sys/mips/ingenic/jz4780_lcd.c user/ngie/bug-237403/sys/ofed/drivers/infiniband/core/ib_roce_gid_mgmt.c user/ngie/bug-237403/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c user/ngie/bug-237403/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c user/ngie/bug-237403/tests/sys/opencrypto/cryptotest.py Directory Properties: user/ngie/bug-237403/ (props changed) Modified: user/ngie/bug-237403/stand/common/load_elf.c ============================================================================== --- user/ngie/bug-237403/stand/common/load_elf.c Tue May 21 01:42:57 2019 (r348028) +++ user/ngie/bug-237403/stand/common/load_elf.c Tue May 21 01:56:26 2019 (r348029) @@ -509,7 +509,7 @@ __elfN(loadimage)(struct preloaded_file *fp, elf_file_ off -= ehdr->e_entry & ~PAGE_MASK; ehdr->e_entry += off; #ifdef ELF_VERBOSE - printf("ehdr->e_entry 0x%jx", va<->pa off %llx\n", + printf("ehdr->e_entry 0x%jx, va<->pa off %llx\n", (uintmax_t)ehdr->e_entry, off); #endif #else Modified: user/ngie/bug-237403/stand/powerpc/Makefile ============================================================================== --- user/ngie/bug-237403/stand/powerpc/Makefile Tue May 21 01:42:57 2019 (r348028) +++ user/ngie/bug-237403/stand/powerpc/Makefile Tue May 21 01:56:26 2019 (r348029) @@ -5,6 +5,9 @@ NO_OBJ=t .include <bsd.init.mk> SUBDIR.yes= boot1.chrp ofw uboot + +.if "${TARGET_ARCH}" == "powerpc64" SUBDIR.${MK_FDT}+= kboot +.endif .include <bsd.subdir.mk> Modified: user/ngie/bug-237403/sys/arm/allwinner/a10_fb.c ============================================================================== --- user/ngie/bug-237403/sys/arm/allwinner/a10_fb.c Tue May 21 01:42:57 2019 (r348028) +++ user/ngie/bug-237403/sys/arm/allwinner/a10_fb.c Tue May 21 01:56:26 2019 (r348029) @@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$"); #include <sys/bus.h> #include <sys/rman.h> #include <sys/condvar.h> +#include <sys/eventhandler.h> #include <sys/kernel.h> #include <sys/module.h> #include <sys/fbio.h> Modified: user/ngie/bug-237403/sys/arm/allwinner/a10_hdmi.c ============================================================================== --- user/ngie/bug-237403/sys/arm/allwinner/a10_hdmi.c Tue May 21 01:42:57 2019 (r348028) +++ user/ngie/bug-237403/sys/arm/allwinner/a10_hdmi.c Tue May 21 01:56:26 2019 (r348029) @@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$"); #include <sys/bus.h> #include <sys/rman.h> #include <sys/condvar.h> +#include <sys/eventhandler.h> #include <sys/kernel.h> #include <sys/module.h> Modified: user/ngie/bug-237403/sys/arm/amlogic/aml8726/aml8726_wdt.c ============================================================================== --- user/ngie/bug-237403/sys/arm/amlogic/aml8726/aml8726_wdt.c Tue May 21 01:42:57 2019 (r348028) +++ user/ngie/bug-237403/sys/arm/amlogic/aml8726/aml8726_wdt.c Tue May 21 01:56:26 2019 (r348029) @@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> +#include <sys/eventhandler.h> #include <sys/kernel.h> #include <sys/module.h> #include <sys/malloc.h> Modified: user/ngie/bug-237403/sys/arm/freescale/imx/imx6_ipu.c ============================================================================== --- user/ngie/bug-237403/sys/arm/freescale/imx/imx6_ipu.c Tue May 21 01:42:57 2019 (r348028) +++ user/ngie/bug-237403/sys/arm/freescale/imx/imx6_ipu.c Tue May 21 01:56:26 2019 (r348029) @@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$"); #include <sys/kernel.h> #include <sys/module.h> #include <sys/clock.h> +#include <sys/eventhandler.h> #include <sys/time.h> #include <sys/bus.h> #include <sys/lock.h> Modified: user/ngie/bug-237403/sys/arm/rockchip/rk30xx_wdog.c ============================================================================== --- user/ngie/bug-237403/sys/arm/rockchip/rk30xx_wdog.c Tue May 21 01:42:57 2019 (r348028) +++ user/ngie/bug-237403/sys/arm/rockchip/rk30xx_wdog.c Tue May 21 01:56:26 2019 (r348029) @@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$"); #include <sys/systm.h> #include <sys/watchdog.h> #include <sys/bus.h> +#include <sys/eventhandler.h> #include <sys/kernel.h> #include <sys/lock.h> #include <sys/module.h> Modified: user/ngie/bug-237403/sys/arm/ti/am335x/am335x_lcd.c ============================================================================== --- user/ngie/bug-237403/sys/arm/ti/am335x/am335x_lcd.c Tue May 21 01:42:57 2019 (r348028) +++ user/ngie/bug-237403/sys/arm/ti/am335x/am335x_lcd.c Tue May 21 01:56:26 2019 (r348029) @@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$"); #include <sys/kernel.h> #include <sys/module.h> #include <sys/clock.h> +#include <sys/eventhandler.h> #include <sys/time.h> #include <sys/bus.h> #include <sys/lock.h> Modified: user/ngie/bug-237403/sys/arm/ti/am335x/tda19988.c ============================================================================== --- user/ngie/bug-237403/sys/arm/ti/am335x/tda19988.c Tue May 21 01:42:57 2019 (r348028) +++ user/ngie/bug-237403/sys/arm/ti/am335x/tda19988.c Tue May 21 01:56:26 2019 (r348029) @@ -34,6 +34,7 @@ __FBSDID("$FreeBSD$"); #include <sys/kernel.h> #include <sys/module.h> #include <sys/clock.h> +#include <sys/eventhandler.h> #include <sys/time.h> #include <sys/bus.h> #include <sys/resource.h> Modified: user/ngie/bug-237403/sys/compat/linuxkpi/common/src/linux_compat.c ============================================================================== --- user/ngie/bug-237403/sys/compat/linuxkpi/common/src/linux_compat.c Tue May 21 01:42:57 2019 (r348028) +++ user/ngie/bug-237403/sys/compat/linuxkpi/common/src/linux_compat.c Tue May 21 01:56:26 2019 (r348029) @@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$"); #include <sys/lock.h> #include <sys/mutex.h> #include <sys/bus.h> +#include <sys/eventhandler.h> #include <sys/fcntl.h> #include <sys/file.h> #include <sys/filio.h> Modified: user/ngie/bug-237403/sys/dev/drm2/ttm/ttm_page_alloc.c ============================================================================== --- user/ngie/bug-237403/sys/dev/drm2/ttm/ttm_page_alloc.c Tue May 21 01:42:57 2019 (r348028) +++ user/ngie/bug-237403/sys/dev/drm2/ttm/ttm_page_alloc.c Tue May 21 01:56:26 2019 (r348029) @@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$"); #include <dev/drm2/drmP.h> #include <dev/drm2/ttm/ttm_bo_driver.h> #include <dev/drm2/ttm/ttm_page_alloc.h> +#include <sys/eventhandler.h> #include <vm/vm_pageout.h> #define NUM_PAGES_TO_ALLOC (PAGE_SIZE/sizeof(vm_page_t)) Modified: user/ngie/bug-237403/sys/dev/fb/creator.c ============================================================================== --- user/ngie/bug-237403/sys/dev/fb/creator.c Tue May 21 01:42:57 2019 (r348028) +++ user/ngie/bug-237403/sys/dev/fb/creator.c Tue May 21 01:56:26 2019 (r348029) @@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$"); #include <sys/bus.h> #include <sys/conf.h> #include <sys/consio.h> +#include <sys/eventhandler.h> #include <sys/fbio.h> #include <sys/kernel.h> #include <sys/module.h> Modified: user/ngie/bug-237403/sys/dev/fb/fbd.c ============================================================================== --- user/ngie/bug-237403/sys/dev/fb/fbd.c Tue May 21 01:42:57 2019 (r348028) +++ user/ngie/bug-237403/sys/dev/fb/fbd.c Tue May 21 01:56:26 2019 (r348029) @@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$"); #include <sys/systm.h> #include <sys/bus.h> #include <sys/conf.h> +#include <sys/eventhandler.h> #include <sys/kernel.h> #include <sys/malloc.h> #include <sys/module.h> Modified: user/ngie/bug-237403/sys/dev/hdmi/dwc_hdmi.c ============================================================================== --- user/ngie/bug-237403/sys/dev/hdmi/dwc_hdmi.c Tue May 21 01:42:57 2019 (r348028) +++ user/ngie/bug-237403/sys/dev/hdmi/dwc_hdmi.c Tue May 21 01:56:26 2019 (r348029) @@ -33,6 +33,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> +#include <sys/eventhandler.h> #include <sys/kernel.h> #include <sys/module.h> #include <sys/malloc.h> Modified: user/ngie/bug-237403/sys/dev/iscsi_initiator/iscsi.c ============================================================================== --- user/ngie/bug-237403/sys/dev/iscsi_initiator/iscsi.c Tue May 21 01:42:57 2019 (r348028) +++ user/ngie/bug-237403/sys/dev/iscsi_initiator/iscsi.c Tue May 21 01:56:26 2019 (r348029) @@ -37,6 +37,9 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/capsicum.h> +#ifdef DO_EVENTHANDLER +#include <sys/eventhandler.h> +#endif #include <sys/kernel.h> #include <sys/module.h> #include <sys/conf.h> Modified: user/ngie/bug-237403/sys/dev/mlx4/mlx4_en/mlx4_en_netdev.c ============================================================================== --- user/ngie/bug-237403/sys/dev/mlx4/mlx4_en/mlx4_en_netdev.c Tue May 21 01:42:57 2019 (r348028) +++ user/ngie/bug-237403/sys/dev/mlx4/mlx4_en/mlx4_en_netdev.c Tue May 21 01:56:26 2019 (r348029) @@ -47,6 +47,7 @@ #include <dev/mlx4/cmd.h> #include <dev/mlx4/cq.h> +#include <sys/eventhandler.h> #include <sys/sockio.h> #include <sys/sysctl.h> Modified: user/ngie/bug-237403/sys/dev/mlx5/mlx5_en/mlx5_en_main.c ============================================================================== --- user/ngie/bug-237403/sys/dev/mlx5/mlx5_en/mlx5_en_main.c Tue May 21 01:42:57 2019 (r348028) +++ user/ngie/bug-237403/sys/dev/mlx5/mlx5_en/mlx5_en_main.c Tue May 21 01:56:26 2019 (r348029) @@ -27,6 +27,7 @@ #include "en.h" +#include <sys/eventhandler.h> #include <sys/sockio.h> #include <machine/atomic.h> Modified: user/ngie/bug-237403/sys/mips/atheros/ar531x/ar5315_wdog.c ============================================================================== --- user/ngie/bug-237403/sys/mips/atheros/ar531x/ar5315_wdog.c Tue May 21 01:42:57 2019 (r348028) +++ user/ngie/bug-237403/sys/mips/atheros/ar531x/ar5315_wdog.c Tue May 21 01:56:26 2019 (r348029) @@ -37,6 +37,7 @@ __FBSDID("$FreeBSD$"); #include <sys/systm.h> #include <sys/watchdog.h> #include <sys/bus.h> +#include <sys/eventhandler.h> #include <sys/kernel.h> #include <sys/module.h> #include <sys/sysctl.h> Modified: user/ngie/bug-237403/sys/mips/cavium/octeon_wdog.c ============================================================================== --- user/ngie/bug-237403/sys/mips/cavium/octeon_wdog.c Tue May 21 01:42:57 2019 (r348028) +++ user/ngie/bug-237403/sys/mips/cavium/octeon_wdog.c Tue May 21 01:56:26 2019 (r348029) @@ -39,6 +39,7 @@ __FBSDID("$FreeBSD$"); #include <sys/systm.h> #include <sys/watchdog.h> #include <sys/bus.h> +#include <sys/eventhandler.h> #include <sys/kernel.h> #include <sys/module.h> #include <sys/sysctl.h> Modified: user/ngie/bug-237403/sys/mips/ingenic/jz4780_lcd.c ============================================================================== --- user/ngie/bug-237403/sys/mips/ingenic/jz4780_lcd.c Tue May 21 01:42:57 2019 (r348028) +++ user/ngie/bug-237403/sys/mips/ingenic/jz4780_lcd.c Tue May 21 01:56:26 2019 (r348029) @@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> +#include <sys/eventhandler.h> #include <sys/rman.h> #include <sys/condvar.h> #include <sys/kernel.h> Modified: user/ngie/bug-237403/sys/ofed/drivers/infiniband/core/ib_roce_gid_mgmt.c ============================================================================== --- user/ngie/bug-237403/sys/ofed/drivers/infiniband/core/ib_roce_gid_mgmt.c Tue May 21 01:42:57 2019 (r348028) +++ user/ngie/bug-237403/sys/ofed/drivers/infiniband/core/ib_roce_gid_mgmt.c Tue May 21 01:56:26 2019 (r348029) @@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$"); #include "core_priv.h" +#include <sys/eventhandler.h> #include <linux/in.h> #include <linux/in6.h> Modified: user/ngie/bug-237403/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c ============================================================================== --- user/ngie/bug-237403/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c Tue May 21 01:42:57 2019 (r348028) +++ user/ngie/bug-237403/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c Tue May 21 01:56:26 2019 (r348029) @@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$"); #include "ipoib.h" +#include <sys/eventhandler.h> static int ipoib_resolvemulti(struct ifnet *, struct sockaddr **, struct sockaddr *); Modified: user/ngie/bug-237403/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c ============================================================================== --- user/ngie/bug-237403/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c Tue May 21 01:42:57 2019 (r348028) +++ user/ngie/bug-237403/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c Tue May 21 01:56:26 2019 (r348029) @@ -66,6 +66,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> +#include <sys/eventhandler.h> #include <sys/kernel.h> #include <sys/malloc.h> Modified: user/ngie/bug-237403/tests/sys/opencrypto/cryptotest.py ============================================================================== --- user/ngie/bug-237403/tests/sys/opencrypto/cryptotest.py Tue May 21 01:42:57 2019 (r348028) +++ user/ngie/bug-237403/tests/sys/opencrypto/cryptotest.py Tue May 21 01:56:26 2019 (r348029) @@ -278,7 +278,7 @@ def GenTestCase(cname): out = r + tag self.assertEqual(out, ct, "Count " + data['Count'] + " Actual: " + \ - repr(out.encode("hex")) + " Expected: " + \ + repr(binascii.hexlify(out)) + " Expected: " + \ repr(data) + " on " + cname) def runCCMDecrypt(self, fname): @@ -333,7 +333,7 @@ def GenTestCase(cname): payload = payload[:plen] self.assertEqual(r, payload, "Count " + data['Count'] + \ - " Actual: " + repr(r.encode("hex")) + \ + " Actual: " + repr(binascii.hexlify(r)) + \ " Expected: " + repr(data) + \ " on " + cname) @@ -432,7 +432,7 @@ def GenTestCase(cname): _, r = c.encrypt(msg, iv="") self.assertEqual(r, md, "Actual: " + \ - repr(r.encode("hex")) + " Expected: " + repr(data) + " on " + cname) + repr(binascii.hexlify(r)) + " Expected: " + repr(data) + " on " + cname) @unittest.skipIf(cname not in shamodules, 'skipping SHA-HMAC on %s' % str(cname)) def test_sha1hmac(self): @@ -493,7 +493,7 @@ def GenTestCase(cname): _, r = c.encrypt(msg, iv="") self.assertEqual(r[:tlen], mac, "Actual: " + \ - repr(r.encode("hex")) + " Expected: " + repr(data)) + repr(binascii.hexlify(r)) + " Expected: " + repr(data)) return GendCryptoTestCase
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201905210156.x4L1uQtE026938>