From owner-freebsd-current@FreeBSD.ORG  Tue Apr 17 15:17:52 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 6E7461065670;
	Tue, 17 Apr 2012 15:17:52 +0000 (UTC)
	(envelope-from marcel@xcllnt.net)
Received: from mail.xcllnt.net (mail.xcllnt.net [70.36.220.4])
	by mx1.freebsd.org (Postfix) with ESMTP id 3360F8FC18;
	Tue, 17 Apr 2012 15:17:52 +0000 (UTC)
Received: from sa-nc-spg-222.static.jnpr.net (natint3.juniper.net
	[66.129.224.36]) (authenticated bits=0)
	by mail.xcllnt.net (8.14.5/8.14.5) with ESMTP id q3HFHdlj063391
	(version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NO);
	Tue, 17 Apr 2012 08:17:45 -0700 (PDT)
	(envelope-from marcel@xcllnt.net)
Mime-Version: 1.0 (Apple Message framework v1257)
Content-Type: text/plain; charset=us-ascii
From: Marcel Moolenaar <marcel@xcllnt.net>
In-Reply-To: <201204171109.33874.jhb@freebsd.org>
Date: Tue, 17 Apr 2012 08:17:37 -0700
Content-Transfer-Encoding: 7bit
Message-Id: <AF120750-FF65-4253-81D7-B83ADCB8417D@xcllnt.net>
References: <31940.74.51.53.177.1334364265.squirrel@courriel.site.uottawa.ca>
	<201204171109.33874.jhb@freebsd.org>
To: John Baldwin <jhb@FreeBSD.org>
X-Mailer: Apple Mail (2.1257)
Cc: kwhite@site.uottawa.ca, freebsd-current@FreeBSD.org,
	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:17:52 -0000


On Apr 17, 2012, at 8:09 AM, John Baldwin wrote:

> 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.

Oh crap. Yes.

-- 
Marcel Moolenaar
marcel@xcllnt.net