Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57d6a793 authored by Mathieu Malaterre's avatar Mathieu Malaterre Committed by Ingo Molnar
Browse files

perf/core: Move the inline keyword at the beginning of the function declaration 



When building perf with W=1 the following warning triggers:

  CC      kernel/events/ring_buffer.o
  kernel/events/ring_buffer.c:105:1: warning: ‘inline’ is not at beginning of declaration [-Wold-style-declaration]
   static bool __always_inline
   ^~~~~~
  ...

Move the inline keyword to the beginning of the function declaration.

Signed-off-by: default avatarMathieu Malaterre <malat@debian.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: trival@kernel.org
Link: http://lkml.kernel.org/r/20180308202856.9378-1-malat@debian.org


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 90718e32

kernel/events/ring_buffer.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -103,7 +103,7 @@ static void perf_output_put_handle(struct perf_output_handle *handle) 
	preempt_enable();

	preempt_enable();

}

}





static bool __always_inline

static __always_inline bool

ring_buffer_has_space(unsigned long head, unsigned long tail,

ring_buffer_has_space(unsigned long head, unsigned long tail,

		      unsigned long data_size, unsigned int size,

		      unsigned long data_size, unsigned int size,

		      bool backward)

		      bool backward)
@@ -114,7 +114,7 @@ ring_buffer_has_space(unsigned long head, unsigned long tail, 
		return CIRC_SPACE(tail, head, data_size) >= size;

		return CIRC_SPACE(tail, head, data_size) >= size;

}

}





static int __always_inline

static __always_inline int

__perf_output_begin(struct perf_output_handle *handle,

__perf_output_begin(struct perf_output_handle *handle,

		    struct perf_event *event, unsigned int size,

		    struct perf_event *event, unsigned int size,

		    bool backward)

		    bool backward)
@@ -414,7 +414,7 @@ void *perf_aux_output_begin(struct perf_output_handle *handle, 
}

}

EXPORT_SYMBOL_GPL(perf_aux_output_begin);

EXPORT_SYMBOL_GPL(perf_aux_output_begin);





static bool __always_inline rb_need_aux_wakeup(struct ring_buffer *rb)

static __always_inline bool rb_need_aux_wakeup(struct ring_buffer *rb)

{

{

	if (rb->aux_overwrite)

	if (rb->aux_overwrite)

		return false;

		return false;