Add always_inline attribute to force gcc to inline single-instruction

functions.

diff --git a/src/include/gpxe/job.h b/src/include/gpxe/job.h
index 23077e7..2b33408 100644 (file)
--- a/src/include/gpxe/job.h
+++ b/src/include/gpxe/job.h
@@ -98,7 +98,7 @@ static inline void job_init ( struct job_interface *job,
  * @v intf             Generic object communication interface
  * @ret job            Job control interface
  */
-static inline struct job_interface *
+static inline __attribute__ (( always_inline )) struct job_interface *
 intf_to_job ( struct interface *intf ) {
        return container_of ( intf, struct job_interface, intf );
 }
@@ -109,7 +109,7 @@ intf_to_job ( struct interface *intf ) {
  * @v job              Job control interface
  * @ret dest           Destination interface
  */
-static inline struct job_interface *
+static inline __attribute__ (( always_inline )) struct job_interface *
 job_dest ( struct job_interface *job ) {
        return intf_to_job ( job->intf.dest );
 }

diff --git a/src/include/gpxe/xfer.h b/src/include/gpxe/xfer.h
index 3c46cdf..61f5d86 100644 (file)
--- a/src/include/gpxe/xfer.h
+++ b/src/include/gpxe/xfer.h
@@ -138,7 +138,7 @@ static inline void xfer_init ( struct xfer_interface *xfer,
  * @v intf             Generic object communication interface
  * @ret xfer           Data transfer interface
  */
-static inline struct xfer_interface *
+static inline __attribute__ (( always_inline )) struct xfer_interface *
 intf_to_xfer ( struct interface *intf ) {
        return container_of ( intf, struct xfer_interface, intf );
 }
@@ -149,7 +149,7 @@ intf_to_xfer ( struct interface *intf ) {
  * @v xfer             Data transfer interface
  * @ret dest           Destination interface
  */
-static inline struct xfer_interface *
+static inline __attribute__ (( always_inline )) struct xfer_interface *
 xfer_dest ( struct xfer_interface *xfer ) {
        return intf_to_xfer ( xfer->intf.dest );
 }