Date: Mon, 3 Feb 2020 10:57:37 +0000 (UTC) From: Hans Petter Selasky <hselasky@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r357434 - stable/11/sys/dev/usb/template Message-ID: <202002031057.013Avbmc053859@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hselasky Date: Mon Feb 3 10:57:37 2020 New Revision: 357434 URL: https://svnweb.freebsd.org/changeset/base/357434 Log: MFC r328985: Give USB template SYSUNINIT()'s a uniq name to avoid symbol name collision when building stand/usb. Regression after r328194. Sponsored by: Mellanox Technologies Modified: stable/11/sys/dev/usb/template/usb_template_audio.c stable/11/sys/dev/usb/template/usb_template_cdce.c stable/11/sys/dev/usb/template/usb_template_kbd.c stable/11/sys/dev/usb/template/usb_template_midi.c stable/11/sys/dev/usb/template/usb_template_modem.c stable/11/sys/dev/usb/template/usb_template_mouse.c stable/11/sys/dev/usb/template/usb_template_msc.c stable/11/sys/dev/usb/template/usb_template_mtp.c stable/11/sys/dev/usb/template/usb_template_phone.c stable/11/sys/dev/usb/template/usb_template_serialnet.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/usb/template/usb_template_audio.c ============================================================================== --- stable/11/sys/dev/usb/template/usb_template_audio.c Mon Feb 3 10:53:03 2020 (r357433) +++ stable/11/sys/dev/usb/template/usb_template_audio.c Mon Feb 3 10:57:37 2020 (r357434) @@ -473,4 +473,4 @@ audio_uninit(void *arg __unused) } SYSINIT(audio_init, SI_SUB_LOCK, SI_ORDER_FIRST, audio_init, NULL); -SYSUNINIT(audio_init, SI_SUB_LOCK, SI_ORDER_FIRST, audio_uninit, NULL); +SYSUNINIT(audio_uninit, SI_SUB_LOCK, SI_ORDER_FIRST, audio_uninit, NULL); Modified: stable/11/sys/dev/usb/template/usb_template_cdce.c ============================================================================== --- stable/11/sys/dev/usb/template/usb_template_cdce.c Mon Feb 3 10:53:03 2020 (r357433) +++ stable/11/sys/dev/usb/template/usb_template_cdce.c Mon Feb 3 10:57:37 2020 (r357434) @@ -346,4 +346,4 @@ eth_uninit(void *arg __unused) } SYSINIT(eth_init, SI_SUB_LOCK, SI_ORDER_FIRST, eth_init, NULL); -SYSUNINIT(eth_init, SI_SUB_LOCK, SI_ORDER_FIRST, eth_uninit, NULL); +SYSUNINIT(eth_uninit, SI_SUB_LOCK, SI_ORDER_FIRST, eth_uninit, NULL); Modified: stable/11/sys/dev/usb/template/usb_template_kbd.c ============================================================================== --- stable/11/sys/dev/usb/template/usb_template_kbd.c Mon Feb 3 10:53:03 2020 (r357433) +++ stable/11/sys/dev/usb/template/usb_template_kbd.c Mon Feb 3 10:57:37 2020 (r357434) @@ -287,4 +287,4 @@ kbd_uninit(void *arg __unused) } SYSINIT(kbd_init, SI_SUB_LOCK, SI_ORDER_FIRST, kbd_init, NULL); -SYSUNINIT(kbd_init, SI_SUB_LOCK, SI_ORDER_FIRST, kbd_uninit, NULL); +SYSUNINIT(kbd_uninit, SI_SUB_LOCK, SI_ORDER_FIRST, kbd_uninit, NULL); Modified: stable/11/sys/dev/usb/template/usb_template_midi.c ============================================================================== --- stable/11/sys/dev/usb/template/usb_template_midi.c Mon Feb 3 10:53:03 2020 (r357433) +++ stable/11/sys/dev/usb/template/usb_template_midi.c Mon Feb 3 10:57:37 2020 (r357434) @@ -309,4 +309,4 @@ midi_uninit(void *arg __unused) } SYSINIT(midi_init, SI_SUB_LOCK, SI_ORDER_FIRST, midi_init, NULL); -SYSUNINIT(midi_init, SI_SUB_LOCK, SI_ORDER_FIRST, midi_uninit, NULL); +SYSUNINIT(midi_uninit, SI_SUB_LOCK, SI_ORDER_FIRST, midi_uninit, NULL); Modified: stable/11/sys/dev/usb/template/usb_template_modem.c ============================================================================== --- stable/11/sys/dev/usb/template/usb_template_modem.c Mon Feb 3 10:53:03 2020 (r357433) +++ stable/11/sys/dev/usb/template/usb_template_modem.c Mon Feb 3 10:57:37 2020 (r357434) @@ -315,4 +315,4 @@ modem_uninit(void *arg __unused) } SYSINIT(modem_init, SI_SUB_LOCK, SI_ORDER_FIRST, modem_init, NULL); -SYSUNINIT(modem_init, SI_SUB_LOCK, SI_ORDER_FIRST, modem_uninit, NULL); +SYSUNINIT(modem_uninit, SI_SUB_LOCK, SI_ORDER_FIRST, modem_uninit, NULL); Modified: stable/11/sys/dev/usb/template/usb_template_mouse.c ============================================================================== --- stable/11/sys/dev/usb/template/usb_template_mouse.c Mon Feb 3 10:53:03 2020 (r357433) +++ stable/11/sys/dev/usb/template/usb_template_mouse.c Mon Feb 3 10:57:37 2020 (r357434) @@ -285,4 +285,4 @@ mouse_uninit(void *arg __unused) } SYSINIT(mouse_init, SI_SUB_LOCK, SI_ORDER_FIRST, mouse_init, NULL); -SYSUNINIT(mouse_init, SI_SUB_LOCK, SI_ORDER_FIRST, mouse_uninit, NULL); +SYSUNINIT(mouse_uninit, SI_SUB_LOCK, SI_ORDER_FIRST, mouse_uninit, NULL); Modified: stable/11/sys/dev/usb/template/usb_template_msc.c ============================================================================== --- stable/11/sys/dev/usb/template/usb_template_msc.c Mon Feb 3 10:53:03 2020 (r357433) +++ stable/11/sys/dev/usb/template/usb_template_msc.c Mon Feb 3 10:57:37 2020 (r357434) @@ -255,4 +255,4 @@ msc_uninit(void *arg __unused) } SYSINIT(msc_init, SI_SUB_LOCK, SI_ORDER_FIRST, msc_init, NULL); -SYSUNINIT(msc_init, SI_SUB_LOCK, SI_ORDER_FIRST, msc_uninit, NULL); +SYSUNINIT(msc_uninit, SI_SUB_LOCK, SI_ORDER_FIRST, msc_uninit, NULL); Modified: stable/11/sys/dev/usb/template/usb_template_mtp.c ============================================================================== --- stable/11/sys/dev/usb/template/usb_template_mtp.c Mon Feb 3 10:53:03 2020 (r357433) +++ stable/11/sys/dev/usb/template/usb_template_mtp.c Mon Feb 3 10:57:37 2020 (r357434) @@ -322,4 +322,4 @@ mtp_uninit(void *arg __unused) } SYSINIT(mtp_init, SI_SUB_LOCK, SI_ORDER_FIRST, mtp_init, NULL); -SYSUNINIT(mtp_init, SI_SUB_LOCK, SI_ORDER_FIRST, mtp_uninit, NULL); +SYSUNINIT(mtp_uninit, SI_SUB_LOCK, SI_ORDER_FIRST, mtp_uninit, NULL); Modified: stable/11/sys/dev/usb/template/usb_template_phone.c ============================================================================== --- stable/11/sys/dev/usb/template/usb_template_phone.c Mon Feb 3 10:53:03 2020 (r357433) +++ stable/11/sys/dev/usb/template/usb_template_phone.c Mon Feb 3 10:57:37 2020 (r357434) @@ -500,4 +500,4 @@ phone_uninit(void *arg __unused) } SYSINIT(phone_init, SI_SUB_LOCK, SI_ORDER_FIRST, phone_init, NULL); -SYSUNINIT(phone_init, SI_SUB_LOCK, SI_ORDER_FIRST, phone_uninit, NULL); +SYSUNINIT(phone_uninit, SI_SUB_LOCK, SI_ORDER_FIRST, phone_uninit, NULL); Modified: stable/11/sys/dev/usb/template/usb_template_serialnet.c ============================================================================== --- stable/11/sys/dev/usb/template/usb_template_serialnet.c Mon Feb 3 10:53:03 2020 (r357433) +++ stable/11/sys/dev/usb/template/usb_template_serialnet.c Mon Feb 3 10:57:37 2020 (r357434) @@ -456,4 +456,4 @@ serialnet_uninit(void *arg __unused) } SYSINIT(serialnet_init, SI_SUB_LOCK, SI_ORDER_FIRST, serialnet_init, NULL); -SYSUNINIT(serialnet_init, SI_SUB_LOCK, SI_ORDER_FIRST, serialnet_uninit, NULL); +SYSUNINIT(serialnet_uninit, SI_SUB_LOCK, SI_ORDER_FIRST, serialnet_uninit, NULL);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002031057.013Avbmc053859>