svn commit: r303123 - head/sys/cam

[Andrew Turner]

On Thu, 21 Jul 2016 03:11:35 +0000 (UTC)
Warner Losh <imp at FreeBSD.org> wrote:

> Author: imp
> Date: Thu Jul 21 03:11:35 2016
> New Revision: 303123
> URL: https://svnweb.freebsd.org/changeset/base/303123
> 
> Log:
>   Fix mismerge and include the nvme support.
>   Also, print out the name of any CCB's functions that's not
> supported. 
>   MFC after: 1 week
> 
> Modified:
>   head/sys/cam/cam_xpt.c
> 
> Modified: head/sys/cam/cam_xpt.c
> ==============================================================================
> --- head/sys/cam/cam_xpt.c	Thu Jul 21 00:53:14 2016
> (r303122) +++ head/sys/cam/cam_xpt.c	Thu Jul 21 03:11:35
> 2016	(r303123) @@ -1033,6 +1033,8 @@
> xpt_announce_periph(struct cam_periph *p else if
> (path->device->protocol == PROTO_SEMB) semb_print_ident(
>  		    (struct sep_identify_data
> *)&path->device->ident_data);
> +	else if (path->device->protocol == PROTO_NVME)
> +		nvme_print_ident(path->device->nvme_cdata,
> path->device->nvme_data);
This breaks kernel configs with scbus but not nvme. This seems to be
most of the non-x86 configs.

linking kernel.full
cam_xpt.o: In function `xpt_announce_periph':
/usr/home/andrew/freebsd/repo/head-svn/sys/cam/cam_xpt.c:1037: undefined reference to `nvme_print_ident'
cam_xpt.o: In function `xpt_denounce_periph':
/usr/home/andrew/freebsd/repo/head-svn/sys/cam/cam_xpt.c:1092: undefined reference to `nvme_print_ident'
cam_xpt.o: In function `xpt_run_devq':
/usr/home/andrew/freebsd/repo/head-svn/sys/cam/cam_xpt.c:3331: undefined reference to `nvme_op_string'
/usr/home/andrew/freebsd/repo/head-svn/sys/cam/cam_xpt.c:3331: undefined reference to `nvme_cmd_string'
cam_xpt.o: In function `xpt_bus_register':
/usr/home/andrew/freebsd/repo/head-svn/sys/cam/cam_xpt.c:3927: undefined reference to `nvme_get_xport'
--- kernel.full ---
*** [kernel.full] Error code 1


Andrew