svn commit: r309531 - head/sys/arm/include

[Andrew Turner]

On Sun, 4 Dec 2016 15:27:39 +0000 (UTC)
Michal Meloun <mmel at FreeBSD.org> 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