From owner-svn-src-head@freebsd.org Mon Dec 5 16:06:34 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 693C0C67FC2; Mon, 5 Dec 2016 16:06:34 +0000 (UTC) (envelope-from melounmichal@gmail.com) Received: from mail-wj0-x244.google.com (mail-wj0-x244.google.com [IPv6:2a00:1450:400c:c01::244]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0484216BA; Mon, 5 Dec 2016 16:06:33 +0000 (UTC) (envelope-from melounmichal@gmail.com) Received: by mail-wj0-x244.google.com with SMTP id kp2so40041041wjc.0; Mon, 05 Dec 2016 08:06:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:reply-to:subject:references:to:cc:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=j37TXx7dREFBFH8He4RSNtF+Y2ymyN7d80Ul9AhhMAo=; b=gBtk7vT29UnaCs3YU29XU4MacJGJ8YEogevRof9trpeQziPABa9WAGYpTyGbmdqtIO UOJl0beJyqeO3ebtw3PUi0TWUAvkoQ5IbRvn4SEowxYOsAS+a3XCT2G3yJfdv1PhyT/y qpq+/LbLRhUe0NMUK5QNUY58xpEGoFO4B6JA/64xQqhNUS6uWuAej6pkd5Y3MzIQdOpG xmrXvrSnQl/yojzvA3QYRnRcK/9qkduZwtDFBwlhAKDWQJgR19GXJQlJygRb2PHdcJaG apy4UxXHD6ZH05QjwKSzqFyvq5hkU4jMl/dq3BwHzckgMgjI2tKBuzZSvHsPS8fX2Zug veIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:reply-to:subject:references:to:cc :message-id:date:user-agent:mime-version:in-reply-to :content-transfer-encoding; bh=j37TXx7dREFBFH8He4RSNtF+Y2ymyN7d80Ul9AhhMAo=; b=YpBatdz5Nqd5T3ekgCxDPMabkjamlIM7kajPgu167/7Npsody5BRhKYZYnDzhhJ80Q PEppRrl/m2sPQf419FXaUUJUqzTHURroNPg1zTPqW5pVI1lC/9tvUyHp92d1jFjMaiqc IS7bBZtHG07cIoOzGF1OX9J/yD089oy/hFG1S04DGejJm7y/l/D5mRkymIWSIhkFGT2Y gmXhW3+jUXvJIbLhIbFpED1N9kbEu3mDDvmU9K8KjacsDybfMVcKvdr4mke1GYFiYxop bVpq7386r6MQe57K1ve8eaV4pYIETtnh2NARJaeTefu1otFWh6G8BTZNAozBnhFlTtf0 q1Pg== X-Gm-Message-State: AKaTC00f5j7/8TRVrc3hmdoLItqi+4Q+aANrd+27X+nr+wcWza81FHLi/EWXZnPir0lrMg== X-Received: by 10.194.94.39 with SMTP id cz7mr26661829wjb.204.1480953992043; Mon, 05 Dec 2016 08:06:32 -0800 (PST) Received: from [88.208.79.100] (halouny.humusoft.cz. [88.208.79.100]) by smtp.gmail.com with ESMTPSA id f3sm816333wmf.10.2016.12.05.08.06.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Dec 2016 08:06:31 -0800 (PST) From: Michal Meloun X-Google-Original-From: Michal Meloun Reply-To: mmel@freebsd.org Subject: Re: svn commit: r309531 - head/sys/arm/include References: <201612041527.uB4FRduc064051@repo.freebsd.org> <20161205112546.2b212de2@zapp> To: Andrew Turner Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-ID: <283ab7ec-8c06-b092-7059-637ddc22b7d4@freebsd.org> Date: Mon, 5 Dec 2016 17:06:33 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.5.1 MIME-Version: 1.0 In-Reply-To: <20161205112546.2b212de2@zapp> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Dec 2016 16:06:34 -0000 Fixed in r309553. Sorry for breakage and thanks for report. Michal On 05.12.2016 12:25, Andrew Turner wrote: > On Sun, 4 Dec 2016 15:27:39 +0000 (UTC) > Michal Meloun wrote: > >> Author: mmel >> Date: Sun Dec 4 15:27:39 2016 >> New Revision: 309531 >> URL: https://svnweb.freebsd.org/changeset/base/309531 >> >> Log: >> Implement fake pmap_mapdev_attr() for ARMv6. >> This function is referenced, but never called from DRM2 code. Also, >> real behavior of pmap_mapdev_attr() in ARM world is unclear as we >> don't have any additional attribute for a device memory type. >> >> MFC after: 2 weeks >> >> Modified: >> head/sys/arm/include/pmap-v6.h >> head/sys/arm/include/pmap.h >> >> Modified: head/sys/arm/include/pmap-v6.h >> ============================================================================== >> --- head/sys/arm/include/pmap-v6.h Sun Dec 4 13:56:15 >> 2016 (r309530) +++ head/sys/arm/include/pmap-v6.h Sun >> Dec 4 15:27:39 2016 (r309531) @@ -166,7 +166,6 @@ extern >> ttb_entry_t pmap_kern_ttb; /* TT void >> pmap_bootstrap(vm_offset_t); void pmap_kenter(vm_offset_t, >> vm_paddr_t); void pmap_kremove(vm_offset_t); >> -void *pmap_mapdev_attr(vm_paddr_t, vm_size_t, int); >> boolean_t pmap_page_is_mapped(vm_page_t); >> >> void pmap_tlb_flush(pmap_t, vm_offset_t); >> >> Modified: head/sys/arm/include/pmap.h >> ============================================================================== >> --- head/sys/arm/include/pmap.h Sun Dec 4 13:56:15 >> 2016 (r309530) +++ head/sys/arm/include/pmap.h Sun Dec >> 4 15:27:39 2016 (r309531) @@ -53,6 +53,12 @@ void >> pmap_page_set_memattr(vm_page_t, vm void *pmap_mapdev(vm_paddr_t, >> vm_size_t); void pmap_unmapdev(vm_offset_t, vm_size_t); >> >> +static inline void * >> +pmap_mapdev_attr(vm_paddr_t addr, vm_size_t size, int attr) >> +{ >> + panic("%s is not implemented yet!\n", __func__); >> +} >> + >> struct pcb; >> void pmap_set_pcb_pagedir(pmap_t, struct pcb *); >> >> > This broke building the cloudabi module: > > ===> cloudabi (all) > cc -target arm-gnueabi-freebsd12.0 --sysroot=/scratch/tmp/andrew/obj/arm.arm/scratch/tmp/andrew/head-git/tmp -B/scratch/tmp/andrew/obj/arm.arm/scratch/tmp/andrew > /head-git/tmp/usr/bin -O -pipe -Werror -D_KERNEL -DKLD_MODULE -nostdinc -DHAVE_KERNEL_OPTION_HEADERS -include /scratch/tmp/andrew/obj/arm.arm/scratch/tmp/and > rew/head-git/sys/GENERIC/opt_global.h -I. -I/scratch/tmp/andrew/head-git/sys -fno-common -g -funwind-tables -I/scratch/tmp/andrew/obj/arm.arm/scratch/tmp/andrew/ > head-git/sys/GENERIC -march=armv7a -MD -MF.depend.cloudabi_vdso.o -MTcloudabi_vdso.o -ffreestanding -fwrapv -gdwarf-2 -Wall -Wredundant-decls -Wnested-externs - > Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -Wundef -Wno-pointer-sign -D__printf__=__freebsd_kprintf__ -Wmissing-include-dirs -f > diagnostics-show-option -Wno-unknown-pragmas -Wno-error-tautological-compare -Wno-error-empty-body -Wno-error-parentheses-equality -Wno-error-unused-function -Wn > o-error-pointer-sign -Wno-error-shift-negative-value -mno-movt -mfpu=none -std=iso9899:1999 -c /scratch/tmp/andrew/head-git/sys/modules/cloudabi/../../compat/c > loudabi/cloudabi_vdso.c -o cloudabi_vdso.o > In file included from /scratch/tmp/andrew/head-git/sys/modules/cloudabi/../../compat/cloudabi/cloudabi_vdso.c:35: > In file included from /scratch/tmp/andrew/head-git/sys/vm/pmap.h:90: > ./machine/pmap.h:59:2: error: implicit declaration of function 'panic' is invalid in C99 [-Werror,-Wimplicit-function-declaration] > panic("%s is not implemented yet!\n", __func__); > ^ > ./machine/pmap.h:60:1: error: control reaches end of non-void function [-Werror,-Wreturn-type] > } > ^ > In file included from /scratch/tmp/andrew/head-git/sys/modules/cloudabi/../../compat/cloudabi/cloudabi_vdso.c:38: > In file included from /scratch/tmp/andrew/head-git/sys/vm/vm_page.h:345: > /scratch/tmp/andrew/head-git/sys/sys/systm.h:196:6: error: conflicting types for 'panic' > void panic(const char *, ...) __dead2 __printflike(1, 2); > ^ > ./machine/pmap.h:59:2: note: previous implicit declaration is here > panic("%s is not implemented yet!\n", __func__); > ^ > 3 errors generated. > *** Error code 1 > > Andrew