trace: declare blk_add_trace_rq non-static on OL6

In an external module, there is a reference to this function done
via explicit symbol lookup. The newer compiler used for retpoline
support on OL6 changes the symbol's asm name, which causes this lookup
to fail.

While it doesn't guarantee kABI compatibility, remove the "static"
qualifier for this function, on OL6 only, to allow continuing usage of
this code in the short term.

Orabug: 27578618
Signed-off-by: Todd Vierling <todd.vierling@oracle.com>
Reviewed-by: Jack Vogel <jack.vogel@oracle.com>

diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index 483cecfa5c174d6a74c54d5663b8b00578759d11..cb5e8c16ba019b953abb0916a143b4a9b1e27c04 100644 (file)
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -709,7 +709,11 @@ void blk_trace_shutdown(struct request_queue *q)
  *     Records an action against a request. Will log the bio offset + size.
  *
  **/
-static void blk_add_trace_rq(struct request_queue *q, struct request *rq,
+/* UEK4 OL6: non-static for compatibility with some external modules */
+#ifndef CONFIG_SIMULATE_GCC44_KABI
+static
+#endif
+void blk_add_trace_rq(struct request_queue *q, struct request *rq,
                             unsigned int nr_bytes, u32 what)
 {
        struct blk_trace *bt = q->blk_trace;