Eliminate compilation warnings due to the use of non-static inlines

through the introduction and use of the __gnu89_inline attribute.

Submitted by: bde (i386)
MFC after: 3 days
This commit is contained in:
Alan Cox 2007-12-09 21:00:36 +00:00
parent 1b12fbb195
commit dbfb54ffea
5 changed files with 14 additions and 8 deletions

View File

@ -154,7 +154,7 @@ __FBSDID("$FreeBSD$");
#endif #endif
#if !defined(PMAP_DIAGNOSTIC) #if !defined(PMAP_DIAGNOSTIC)
#define PMAP_INLINE __inline #define PMAP_INLINE __gnu89_inline
#else #else
#define PMAP_INLINE #define PMAP_INLINE
#endif #endif
@ -1094,7 +1094,7 @@ pmap_qremove(vm_offset_t sva, int count)
/*************************************************** /***************************************************
* Page table page management routines..... * Page table page management routines.....
***************************************************/ ***************************************************/
static PMAP_INLINE void static __inline void
pmap_free_zero_pages(vm_page_t free) pmap_free_zero_pages(vm_page_t free)
{ {
vm_page_t m; vm_page_t m;
@ -1110,7 +1110,7 @@ pmap_free_zero_pages(vm_page_t free)
* This routine unholds page table pages, and if the hold count * This routine unholds page table pages, and if the hold count
* drops to zero, then it decrements the wire count. * drops to zero, then it decrements the wire count.
*/ */
static PMAP_INLINE int static __inline int
pmap_unwire_pte_hold(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_page_t *free) pmap_unwire_pte_hold(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_page_t *free)
{ {

View File

@ -116,7 +116,7 @@ amd64/amd64/mptable.c optional mptable
amd64/amd64/mptable_pci.c optional mptable pci amd64/amd64/mptable_pci.c optional mptable pci
amd64/amd64/msi.c optional pci amd64/amd64/msi.c optional pci
amd64/amd64/nexus.c standard amd64/amd64/nexus.c standard
amd64/amd64/pmap.c standard nowerror amd64/amd64/pmap.c standard
amd64/amd64/prof_machdep.c optional profiling-routine amd64/amd64/prof_machdep.c optional profiling-routine
amd64/amd64/sigtramp.S standard amd64/amd64/sigtramp.S standard
amd64/amd64/stack_machdep.c optional ddb | stack amd64/amd64/stack_machdep.c optional ddb | stack

View File

@ -306,7 +306,7 @@ i386/i386/mptable_pci.c optional apic pci
i386/i386/msi.c optional apic pci i386/i386/msi.c optional apic pci
i386/i386/nexus.c standard i386/i386/nexus.c standard
i386/i386/perfmon.c optional perfmon i386/i386/perfmon.c optional perfmon
i386/i386/pmap.c standard nowerror i386/i386/pmap.c standard
i386/i386/ptrace_machdep.c standard i386/i386/ptrace_machdep.c standard
i386/i386/stack_machdep.c optional ddb | stack i386/i386/stack_machdep.c optional ddb | stack
i386/i386/support.s standard i386/i386/support.s standard

View File

@ -163,7 +163,7 @@ __FBSDID("$FreeBSD$");
#endif #endif
#if !defined(PMAP_DIAGNOSTIC) #if !defined(PMAP_DIAGNOSTIC)
#define PMAP_INLINE __inline #define PMAP_INLINE __gnu89_inline
#else #else
#define PMAP_INLINE #define PMAP_INLINE
#endif #endif
@ -1144,7 +1144,7 @@ pmap_qremove(vm_offset_t sva, int count)
/*************************************************** /***************************************************
* Page table page management routines..... * Page table page management routines.....
***************************************************/ ***************************************************/
static PMAP_INLINE void static __inline void
pmap_free_zero_pages(vm_page_t free) pmap_free_zero_pages(vm_page_t free)
{ {
vm_page_t m; vm_page_t m;
@ -1160,7 +1160,7 @@ pmap_free_zero_pages(vm_page_t free)
* This routine unholds page table pages, and if the hold count * This routine unholds page table pages, and if the hold count
* drops to zero, then it decrements the wire count. * drops to zero, then it decrements the wire count.
*/ */
static PMAP_INLINE int static __inline int
pmap_unwire_pte_hold(pmap_t pmap, vm_page_t m, vm_page_t *free) pmap_unwire_pte_hold(pmap_t pmap, vm_page_t m, vm_page_t *free)
{ {

View File

@ -235,6 +235,12 @@
#define __always_inline #define __always_inline
#endif #endif
#if __GNUC_PREREQ__(4, 2) /* actually 4.1.3 */
#define __gnu89_inline __attribute__((__gnu_inline__)) __inline
#else
#define __gnu89_inline
#endif
#if __GNUC_PREREQ__(3, 3) #if __GNUC_PREREQ__(3, 3)
#define __nonnull(x) __attribute__((__nonnull__(x))) #define __nonnull(x) __attribute__((__nonnull__(x)))
#else #else