svn commit: r328985 - head/sys/dev/usb/template
Hans Petter Selasky
hselasky at FreeBSD.org
Wed Feb 7 18:46:10 UTC 2018
Author: hselasky
Date: Wed Feb 7 18:46:08 2018
New Revision: 328985
URL: https://svnweb.freebsd.org/changeset/base/328985
Log:
Give USB template SYSUNINIT()'s a uniq name to avoid symbol name collision
when building stand/usb. Regression after r328194.
MFC after: 1 week
Sponsored by: Mellanox Technologies
Modified:
head/sys/dev/usb/template/usb_template_audio.c
head/sys/dev/usb/template/usb_template_cdce.c
head/sys/dev/usb/template/usb_template_kbd.c
head/sys/dev/usb/template/usb_template_midi.c
head/sys/dev/usb/template/usb_template_modem.c
head/sys/dev/usb/template/usb_template_mouse.c
head/sys/dev/usb/template/usb_template_msc.c
head/sys/dev/usb/template/usb_template_mtp.c
head/sys/dev/usb/template/usb_template_phone.c
head/sys/dev/usb/template/usb_template_serialnet.c
Modified: head/sys/dev/usb/template/usb_template_audio.c
==============================================================================
--- head/sys/dev/usb/template/usb_template_audio.c Wed Feb 7 18:33:53 2018 (r328984)
+++ head/sys/dev/usb/template/usb_template_audio.c Wed Feb 7 18:46:08 2018 (r328985)
@@ -475,4 +475,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: head/sys/dev/usb/template/usb_template_cdce.c
==============================================================================
--- head/sys/dev/usb/template/usb_template_cdce.c Wed Feb 7 18:33:53 2018 (r328984)
+++ head/sys/dev/usb/template/usb_template_cdce.c Wed Feb 7 18:46:08 2018 (r328985)
@@ -348,4 +348,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: head/sys/dev/usb/template/usb_template_kbd.c
==============================================================================
--- head/sys/dev/usb/template/usb_template_kbd.c Wed Feb 7 18:33:53 2018 (r328984)
+++ head/sys/dev/usb/template/usb_template_kbd.c Wed Feb 7 18:46:08 2018 (r328985)
@@ -289,4 +289,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: head/sys/dev/usb/template/usb_template_midi.c
==============================================================================
--- head/sys/dev/usb/template/usb_template_midi.c Wed Feb 7 18:33:53 2018 (r328984)
+++ head/sys/dev/usb/template/usb_template_midi.c Wed Feb 7 18:46:08 2018 (r328985)
@@ -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: head/sys/dev/usb/template/usb_template_modem.c
==============================================================================
--- head/sys/dev/usb/template/usb_template_modem.c Wed Feb 7 18:33:53 2018 (r328984)
+++ head/sys/dev/usb/template/usb_template_modem.c Wed Feb 7 18:46:08 2018 (r328985)
@@ -317,4 +317,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: head/sys/dev/usb/template/usb_template_mouse.c
==============================================================================
--- head/sys/dev/usb/template/usb_template_mouse.c Wed Feb 7 18:33:53 2018 (r328984)
+++ head/sys/dev/usb/template/usb_template_mouse.c Wed Feb 7 18:46:08 2018 (r328985)
@@ -287,4 +287,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: head/sys/dev/usb/template/usb_template_msc.c
==============================================================================
--- head/sys/dev/usb/template/usb_template_msc.c Wed Feb 7 18:33:53 2018 (r328984)
+++ head/sys/dev/usb/template/usb_template_msc.c Wed Feb 7 18:46:08 2018 (r328985)
@@ -257,4 +257,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: head/sys/dev/usb/template/usb_template_mtp.c
==============================================================================
--- head/sys/dev/usb/template/usb_template_mtp.c Wed Feb 7 18:33:53 2018 (r328984)
+++ head/sys/dev/usb/template/usb_template_mtp.c Wed Feb 7 18:46:08 2018 (r328985)
@@ -324,4 +324,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: head/sys/dev/usb/template/usb_template_phone.c
==============================================================================
--- head/sys/dev/usb/template/usb_template_phone.c Wed Feb 7 18:33:53 2018 (r328984)
+++ head/sys/dev/usb/template/usb_template_phone.c Wed Feb 7 18:46:08 2018 (r328985)
@@ -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: head/sys/dev/usb/template/usb_template_serialnet.c
==============================================================================
--- head/sys/dev/usb/template/usb_template_serialnet.c Wed Feb 7 18:33:53 2018 (r328984)
+++ head/sys/dev/usb/template/usb_template_serialnet.c Wed Feb 7 18:46:08 2018 (r328985)
@@ -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);
More information about the svn-src-all
mailing list