Date: Thu, 3 Aug 2017 13:54:46 +0000 (UTC) From: Ngie Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r321994 - in projects/make-check-sandbox: share/misc sys/boot/arm/at91/libat91 sys/boot/arm/ixp425/boot2 sys/boot/i386/boot2 sys/dev/ksyms sys/dev/mlx5/mlx5_core sys/ofed/drivers/infini... Message-ID: <201708031354.v73Dski5049833@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Thu Aug 3 13:54:46 2017 New Revision: 321994 URL: https://svnweb.freebsd.org/changeset/base/321994 Log: MFhead@r321993 Modified: projects/make-check-sandbox/share/misc/organization.dot projects/make-check-sandbox/sys/boot/arm/at91/libat91/lib.h projects/make-check-sandbox/sys/boot/arm/at91/libat91/printf.c projects/make-check-sandbox/sys/boot/arm/at91/libat91/putchar.c projects/make-check-sandbox/sys/boot/arm/ixp425/boot2/ixp425_board.c projects/make-check-sandbox/sys/boot/arm/ixp425/boot2/lib.h projects/make-check-sandbox/sys/boot/i386/boot2/boot2.c projects/make-check-sandbox/sys/dev/ksyms/ksyms.c projects/make-check-sandbox/sys/dev/mlx5/mlx5_core/mlx5_cmd.c projects/make-check-sandbox/sys/dev/mlx5/mlx5_core/mlx5_pagealloc.c projects/make-check-sandbox/sys/ofed/drivers/infiniband/core/addr.c projects/make-check-sandbox/sys/ofed/drivers/infiniband/core/cm.c projects/make-check-sandbox/usr.bin/calendar/calendars/calendar.freebsd Directory Properties: projects/make-check-sandbox/ (props changed) Modified: projects/make-check-sandbox/share/misc/organization.dot ============================================================================== --- projects/make-check-sandbox/share/misc/organization.dot Thu Aug 3 13:52:39 2017 (r321993) +++ projects/make-check-sandbox/share/misc/organization.dot Thu Aug 3 13:54:46 2017 (r321994) @@ -50,7 +50,7 @@ dnsadm [label="DNS Administrators\ndnsadm@FreeBSD.org\ mirroradmin [label="FTP/WWW Mirror Site Coordinators\nmirror-admin@FreeBSD.org\nkuriyama, kensmith"] ncvs [label="CVS src Repository Managers\nncvs@FreeBSD.org\njoe, kuriyama, markm,\nsimon, peter"] perforceadmin [label="Perforce Repository Administrators\nperforce-admin@FreeBSD.org\nscottl, kensmith, gordon,\nrwatson, peter, dhw"] -postmaster [label="Postmaster Team\npostmaster@FreeBSD.org\njmb, brd, sahil, dhw"] +postmaster [label="Postmaster Team\npostmaster@FreeBSD.org\ndhw, ler, pi, rea, remko, zi"] refadm [label="Reference Systems Administrators\nrefadm@FreeBSD.org\njake, billf, markm, simon,\nobrien, ps, kensmith,\npeter, dhw"] webmaster [label="Webmaster Team\nwebmaster@FreeBSD.org\ngjb, wblock, blackend,\ngabor, hrs, wosch"] Modified: projects/make-check-sandbox/sys/boot/arm/at91/libat91/lib.h ============================================================================== --- projects/make-check-sandbox/sys/boot/arm/at91/libat91/lib.h Thu Aug 3 13:52:39 2017 (r321993) +++ projects/make-check-sandbox/sys/boot/arm/at91/libat91/lib.h Thu Aug 3 13:54:46 2017 (r321994) @@ -28,9 +28,9 @@ #define ARM_BOOT_LIB_H int getc(int); -int putchar(int); -int xputchar(int); -int printf(const char *fmt,...); +void putchar(int); +void xputchar(int); +void printf(const char *fmt,...); /* The following function write eeprom at ee_addr using data */ /* from data_add for size bytes. */ Modified: projects/make-check-sandbox/sys/boot/arm/at91/libat91/printf.c ============================================================================== --- projects/make-check-sandbox/sys/boot/arm/at91/libat91/printf.c Thu Aug 3 13:52:39 2017 (r321993) +++ projects/make-check-sandbox/sys/boot/arm/at91/libat91/printf.c Thu Aug 3 13:54:46 2017 (r321994) @@ -20,13 +20,12 @@ #include <stdarg.h> #include "lib.h" -int +void printf(const char *fmt,...) { va_list ap; const char *hex = "0123456789abcdef"; char buf[10]; - const char *fmt_orig = fmt; char *s; unsigned u; int c; @@ -67,5 +66,5 @@ printf(const char *fmt,...) } va_end(ap); - return (int)(fmt - fmt_orig); + return; } Modified: projects/make-check-sandbox/sys/boot/arm/at91/libat91/putchar.c ============================================================================== --- projects/make-check-sandbox/sys/boot/arm/at91/libat91/putchar.c Thu Aug 3 13:52:39 2017 (r321993) +++ projects/make-check-sandbox/sys/boot/arm/at91/libat91/putchar.c Thu Aug 3 13:54:46 2017 (r321994) @@ -39,11 +39,11 @@ #include "lib.h" /* - * int putchar(int ch) + * void putchar(int ch) * Writes a character to the DBGU port. It assumes that DBGU has * already been initialized. */ -int +void putchar(int ch) { AT91PS_USART pUSART = (AT91PS_USART)AT91C_BASE_DBGU; @@ -51,14 +51,12 @@ putchar(int ch) while (!(pUSART->US_CSR & AT91C_US_TXRDY)) continue; pUSART->US_THR = (ch & 0xFF); - return (1); } -int +void xputchar(int ch) { - if (ch == '\n') - putchar('\r'); - putchar(ch); - return (ch == '\n' ? 2 : 1); + if (ch == '\n') + putchar('\r'); + putchar(ch); } Modified: projects/make-check-sandbox/sys/boot/arm/ixp425/boot2/ixp425_board.c ============================================================================== --- projects/make-check-sandbox/sys/boot/arm/ixp425/boot2/ixp425_board.c Thu Aug 3 13:52:39 2017 (r321993) +++ projects/make-check-sandbox/sys/boot/arm/ixp425/boot2/ixp425_board.c Thu Aug 3 13:54:46 2017 (r321994) @@ -165,7 +165,7 @@ getc(int seconds) return c; } -int +void putchar(int ch) { int delay, limit; @@ -179,16 +179,14 @@ putchar(int ch) limit = 40; while ((uart_getreg(ubase, REG_LSR) & LSR_TEMT) == 0 && --limit) DELAY(delay); - return (1); } -int +void xputchar(int ch) { if (ch == '\n') putchar('\r'); putchar(ch); - return (ch == '\n' ? 2 : 1); } void Modified: projects/make-check-sandbox/sys/boot/arm/ixp425/boot2/lib.h ============================================================================== --- projects/make-check-sandbox/sys/boot/arm/ixp425/boot2/lib.h Thu Aug 3 13:52:39 2017 (r321993) +++ projects/make-check-sandbox/sys/boot/arm/ixp425/boot2/lib.h Thu Aug 3 13:54:46 2017 (r321994) @@ -35,12 +35,12 @@ int main(void); void DELAY(int); int getc(int); -int putchar(int); -int xputchar(int); +void putchar(int); +void xputchar(int); void putstr(const char *); void puthex8(u_int8_t); void puthexlist(const u_int8_t *, int); -int printf(const char *fmt,...); +void printf(const char *fmt,...); void bzero(void *, size_t); char *strcpy(char *to, const char *from); Modified: projects/make-check-sandbox/sys/boot/i386/boot2/boot2.c ============================================================================== --- projects/make-check-sandbox/sys/boot/i386/boot2/boot2.c Thu Aug 3 13:52:39 2017 (r321993) +++ projects/make-check-sandbox/sys/boot/i386/boot2/boot2.c Thu Aug 3 13:54:46 2017 (r321994) @@ -114,8 +114,8 @@ void exit(int); static void load(void); static int parse(void); static int dskread(void *, unsigned, unsigned); -static int printf(const char *,...); -static int putchar(int); +static void printf(const char *,...); +static void putchar(int); static int drvread(void *, unsigned, unsigned); static int keyhit(unsigned); static int xputc(int); @@ -521,12 +521,11 @@ error: return -1; } -static int +static void printf(const char *fmt,...) { va_list ap; static char buf[10]; - const char *fmt_orig = fmt; char *s; unsigned u; int c; @@ -557,16 +556,15 @@ printf(const char *fmt,...) putchar(c); } va_end(ap); - return (int)(fmt - fmt_orig); + return; } -static int +static void putchar(int c) { if (c == '\n') xputc('\r'); xputc(c); - return (c == '\n' ? 2 : 1); } static int Modified: projects/make-check-sandbox/sys/dev/ksyms/ksyms.c ============================================================================== --- projects/make-check-sandbox/sys/dev/ksyms/ksyms.c Thu Aug 3 13:52:39 2017 (r321993) +++ projects/make-check-sandbox/sys/dev/ksyms/ksyms.c Thu Aug 3 13:54:46 2017 (r321994) @@ -71,7 +71,7 @@ static d_mmap_single_t ksyms_mmap_single; static struct cdevsw ksyms_cdevsw = { .d_version = D_VERSION, - .d_flags = D_TRACKCLOSE, + .d_flags = 0, .d_open = ksyms_open, .d_read = ksyms_read, .d_mmap_single = ksyms_mmap_single, Modified: projects/make-check-sandbox/sys/dev/mlx5/mlx5_core/mlx5_cmd.c ============================================================================== --- projects/make-check-sandbox/sys/dev/mlx5/mlx5_core/mlx5_cmd.c Thu Aug 3 13:52:39 2017 (r321993) +++ projects/make-check-sandbox/sys/dev/mlx5/mlx5_core/mlx5_cmd.c Thu Aug 3 13:54:46 2017 (r321994) @@ -1434,12 +1434,11 @@ static int cmd_exec_helper(struct mlx5_core_dev *dev, struct mlx5_cmd_msg *inb; struct mlx5_cmd_msg *outb; int pages_queue; - gfp_t gfp; + const gfp_t gfp = GFP_KERNEL; int err; u8 status = 0; pages_queue = is_manage_pages(in); - gfp = callback ? GFP_ATOMIC : GFP_KERNEL; inb = alloc_msg(dev, in_size, gfp); if (IS_ERR(inb)) { Modified: projects/make-check-sandbox/sys/dev/mlx5/mlx5_core/mlx5_pagealloc.c ============================================================================== --- projects/make-check-sandbox/sys/dev/mlx5/mlx5_core/mlx5_pagealloc.c Thu Aug 3 13:52:39 2017 (r321993) +++ projects/make-check-sandbox/sys/dev/mlx5/mlx5_core/mlx5_pagealloc.c Thu Aug 3 13:54:46 2017 (r321994) @@ -190,13 +190,10 @@ mlx5_fwp_free(struct mlx5_fw_page *fwp) num = fwp->numpages; dev = fwp->dev; - /* serialize unloading the DMA maps */ - sx_xlock(&dev->cmd.dma_sx); while (num--) { bus_dmamap_unload(dev->cmd.dma_tag, fwp[num].dma_map); bus_dmamem_free(dev->cmd.dma_tag, fwp[num].virt_addr, fwp[num].dma_map); } - sx_xunlock(&dev->cmd.dma_sx); kfree(fwp); } Modified: projects/make-check-sandbox/sys/ofed/drivers/infiniband/core/addr.c ============================================================================== --- projects/make-check-sandbox/sys/ofed/drivers/infiniband/core/addr.c Thu Aug 3 13:52:39 2017 (r321993) +++ projects/make-check-sandbox/sys/ofed/drivers/infiniband/core/addr.c Thu Aug 3 13:54:46 2017 (r321994) @@ -187,10 +187,10 @@ EXPORT_SYMBOL(rdma_translate_ip); static void set_timeout(unsigned long time) { - unsigned long delay; + int delay; /* under FreeBSD ticks are 32-bit */ delay = time - jiffies; - if ((long)delay <= 0) + if (delay <= 0) delay = 1; mod_delayed_work(addr_wq, &work, delay); Modified: projects/make-check-sandbox/sys/ofed/drivers/infiniband/core/cm.c ============================================================================== --- projects/make-check-sandbox/sys/ofed/drivers/infiniband/core/cm.c Thu Aug 3 13:52:39 2017 (r321993) +++ projects/make-check-sandbox/sys/ofed/drivers/infiniband/core/cm.c Thu Aug 3 13:54:46 2017 (r321994) @@ -889,6 +889,7 @@ retest: cm_reject_sidr_req(cm_id_priv, IB_SIDR_REJECT); break; case IB_CM_REQ_SENT: + case IB_CM_MRA_REQ_RCVD: ib_cancel_mad(cm_id_priv->av.port->mad_agent, cm_id_priv->msg); spin_unlock_irq(&cm_id_priv->lock); ib_send_cm_rej(cm_id, IB_CM_REJ_TIMEOUT, @@ -907,7 +908,6 @@ retest: NULL, 0, NULL, 0); } break; - case IB_CM_MRA_REQ_RCVD: case IB_CM_REP_SENT: case IB_CM_MRA_REP_RCVD: ib_cancel_mad(cm_id_priv->av.port->mad_agent, cm_id_priv->msg); Modified: projects/make-check-sandbox/usr.bin/calendar/calendars/calendar.freebsd ============================================================================== --- projects/make-check-sandbox/usr.bin/calendar/calendars/calendar.freebsd Thu Aug 3 13:52:39 2017 (r321993) +++ projects/make-check-sandbox/usr.bin/calendar/calendars/calendar.freebsd Thu Aug 3 13:54:46 2017 (r321994) @@ -99,6 +99,7 @@ 03/07 Michael P. Pritchard <mpp@FreeBSD.org> born in Los Angeles, California, United States, 1964 03/07 Giorgos Keramidas <keramida@FreeBSD.org> born in Athens, Greece, 1976 03/10 Andreas Klemm <andreas@FreeBSD.org> born in Duesseldorf, Nordrhein-Westfalen, Germany, 1963 +03/10 Luiz Otavio O Souza <loos@FreeBSD.org> born in Bauru, Sao Paulo, Brazil, 1978 03/10 Nikolai Lifanov <lifanov@FreeBSD.org> born in Moscow, Russian Federation, 1989 03/11 Soeren Straarup <xride@FreeBSD.org> born in Andst, Denmark, 1978 03/12 Greg Lewis <glewis@FreeBSD.org> born in Adelaide, South Australia, Australia, 1969 @@ -176,6 +177,7 @@ 05/14 Tatsumi Hosokawa <hosokawa@FreeBSD.org> born in Tokyo, Japan, 1968 05/14 Shigeyuku Fukushima <shige@FreeBSD.org> born in Osaka, Japan, 1974 05/14 Bruce Cran <brucec@FreeBSD.org> born in Cambridge, United Kingdom, 1981 +05/15 Hans Petter Selasky <hselasky@FreeBSD.org> born in Flekkefjord, Norway, 1982 05/16 Johann Kois <jkois@FreeBSD.org> born in Wolfsberg, Austria, 1975 05/16 Marcus Alves Grando <mnag@FreeBSD.org> born in Florianopolis, Santa Catarina, Brazil, 1979 05/17 Thomas Abthorpe <tabthorpe@FreeBSD.org> born in Port Arthur, Ontario, Canada, 1968 @@ -332,6 +334,7 @@ 09/17 Maxim Bolotin <mb@FreeBSD.org> born in Rostov-on-Don, Russian Federation, 1976 09/18 Matthew Fleming <mdf@FreeBSD.org> born in Cleveland, Ohio, United States, 1975 09/20 Kevin Lo <kevlo@FreeBSD.org> born in Taipei, Taiwan, Republic of China, 1972 +09/21 Alex Kozlov <ak@FreeBSD.org> born in Bila Tserkva, Ukraine, 1970 09/21 Gleb Kurtsou <gleb@FreeBSD.org> born in Minsk, Belarus, 1984 09/22 Alan Somers <asomers@FreeBSD.org> born in San Antonio, Texas, United States, 1982 09/22 Bryan Drewery <bdrewery@FreeBSD.org> born in San Diego, California, United States, 1984
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708031354.v73Dski5049833>