diff --git a/[refs] b/[refs] index 2f45a3f556b1..2f1b78300b42 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8350c78734e67ac1f8bfd4eb14b70ff4d01a9a12 +refs/heads/master: 6368a1f4d99fe9a1990ef3f04ab2d2ce9dad0a7c diff --git a/trunk/drivers/oprofile/buffer_sync.c b/trunk/drivers/oprofile/buffer_sync.c index e61e25fda1ad..bf8fcc7163da 100644 --- a/trunk/drivers/oprofile/buffer_sync.c +++ b/trunk/drivers/oprofile/buffer_sync.c @@ -382,7 +382,7 @@ static void add_ibs_begin(int cpu, int code, struct mm_struct *mm) #endif -static void add_sample_entry(unsigned long offset, unsigned long event) +static inline void add_sample_entry(unsigned long offset, unsigned long event) { add_event_entry(offset); add_event_entry(event);