From owner-freebsd-current@FreeBSD.ORG  Tue Apr 17 15:09:35 2012
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0E005106566C;
	Tue, 17 Apr 2012 15:09:35 +0000 (UTC) (envelope-from jhb@freebsd.org)
Received: from bigwig.baldwin.cx (bigknife-pt.tunnel.tserv9.chi1.ipv6.he.net
	[IPv6:2001:470:1f10:75::2])
	by mx1.freebsd.org (Postfix) with ESMTP id D6CB28FC08;
	Tue, 17 Apr 2012 15:09:34 +0000 (UTC)
Received: from jhbbsd.localnet (unknown [209.249.190.124])
	by bigwig.baldwin.cx (Postfix) with ESMTPSA id 4FF8EB915;
	Tue, 17 Apr 2012 11:09:34 -0400 (EDT)
From: John Baldwin <jhb@freebsd.org>
To: freebsd-current@freebsd.org
Date: Tue, 17 Apr 2012 11:09:33 -0400
User-Agent: KMail/1.13.5 (FreeBSD/8.2-CBSD-20110714-p13; KDE/4.5.5; amd64; ; )
References: <31940.74.51.53.177.1334364265.squirrel@courriel.site.uottawa.ca>
In-Reply-To: <31940.74.51.53.177.1334364265.squirrel@courriel.site.uottawa.ca>
MIME-Version: 1.0
Content-Type: Text/Plain;
  charset="iso-8859-15"
Content-Transfer-Encoding: 7bit
Message-Id: <201204171109.33874.jhb@freebsd.org>
X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7
	(bigwig.baldwin.cx); Tue, 17 Apr 2012 11:09:34 -0400 (EDT)
Cc: kwhite@site.uottawa.ca, Marcel Moolenaar <marcel@freebsd.org>
Subject: Re: r234118 uart kernel module failure: "uart_cpu_eqres undefined"
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>, 
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Apr 2012 15:09:35 -0000

On Friday, April 13, 2012 8:44:25 pm kwhite@site.uottawa.ca wrote:
> The change from sys/dev/uart/uart_cpu_{i386,amd64}.c to uart_cpu_x86.c
> probably also needs a corresponding change in the module Makefile.
> 
>         # kldload uart
>         link_elf: symbol uart_cpu_eqres undefined
> 
> Here's one suggestion that works for me:
> 
> Index: /sys/modules/uart/Makefile
> ===================================================================
> --- /sys/modules/uart/Makefile  (revision 234249)
> +++ /sys/modules/uart/Makefile  (working copy)
> @@ -16,6 +16,8 @@
>         uart_if.c uart_if.h uart_subr.c uart_tty.c
>  .if exists(${.CURDIR}/../../dev/uart/uart_cpu_${MACHINE}.c)
>  SRCS+= uart_cpu_${MACHINE}.c
> +.elif ${MACHINE} == "i386" || ${MACHINE} == "amd64"
> +SRCS+= uart_cpu_x86.c
>  .endif
>  SRCS+= bus_if.h card_if.h device_if.h isa_if.h ${ofw_bus_if} pci_if.h \
>         power_if.h pccarddevs.h serdev_if.h
> ------------------------------------------------------------------------

cc'ing Marcel (who made the uart(4) change).  I think this is correct, yes.

-- 
John Baldwin