| Fix gcc(1) warning redundant redeclaration of '...'. |
| |
| diff -ru --exclude-from freebsd-src-diff-exclude-names /usr/src/sys/dev/extres/hwreset/hwreset_if.m freebsd-11.1/sys/dev/extres/hwreset/hwreset_if.m |
| --- /usr/src/sys/dev/extres/hwreset/hwreset_if.m 2017-07-21 07:41:47.000000000 +0800 |
| +++ freebsd-11.1/sys/dev/extres/hwreset/hwreset_if.m 2020-01-11 18:21:09.823968542 +0800 |
| @@ -28,16 +28,13 @@ |
| |
| #ifdef FDT |
| #include <sys/types.h> |
| +#include <dev/extres/hwreset/hwreset.h> |
| #include <dev/ofw/ofw_bus.h> |
| #endif |
| |
| INTERFACE hwreset; |
| |
| #ifdef FDT |
| -HEADER { |
| -int hwreset_default_ofw_map(device_t , phandle_t, int, pcell_t *, intptr_t *); |
| -} |
| - |
| # |
| # map fdt property cells to reset id |
| # Returns 0 on success or a standard errno value. |
| diff -ru --exclude-from freebsd-src-diff-exclude-names /usr/src/sys/i386/include/md_var.h freebsd-11.1/usr/src/sys/i386/include/md_var.h |
| --- /usr/src/sys/i386/include/md_var.h 2017-07-21 07:41:54.000000000 +0800 |
| +++ freebsd-11.1/usr/src/sys/i386/include/md_var.h 2019-03-22 17:41:37.765364000 +0800 |
| @@ -59,7 +59,6 @@ |
| void doreti_popl_es_fault(void) __asm(__STRING(doreti_popl_es_fault)); |
| void doreti_popl_fs(void) __asm(__STRING(doreti_popl_fs)); |
| void doreti_popl_fs_fault(void) __asm(__STRING(doreti_popl_fs_fault)); |
| -void finishidentcpu(void); |
| void fill_based_sd(struct segment_descriptor *sdp, uint32_t base); |
| void i686_pagezero(void *addr); |
| void sse2_pagezero(void *addr); |
| @@ -70,6 +69,5 @@ |
| void setidt(int idx, alias_for_inthand_t *func, int typ, int dpl, int selec); |
| union savefpu *get_pcb_user_save_td(struct thread *td); |
| union savefpu *get_pcb_user_save_pcb(struct pcb *pcb); |
| -struct pcb *get_pcb_td(struct thread *td); |
| |
| #endif /* !_MACHINE_MD_VAR_H_ */ |