diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 15:17:01 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 15:17:01 +1100 |
| commit | 9f72a3a19c1ca629d80c5ddc7eae2e1cb4bd1dcb (patch) | |
| tree | 6522c1e900bf2d02d0a08fa5fc00e3ec9b4482f7 /kernel | |
| parent | c47a63ccb4637bf4e01733e85ecdc269f5d3e76e (diff) | |
| parent | ddf12286951aee1e7763112cf26629de3fabe6ae (diff) | |
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
MAINTAINERS
fs/eventpoll.c
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/trace/ring_buffer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index bd1c35a4fbcc..6ee56b4ad136 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -669,7 +669,7 @@ static struct list_head *rb_list_head(struct list_head *list) * the reader page). But if the next page is a header page, * its flags will be non zero. */ -static int inline +static inline int rb_is_head_page(struct ring_buffer_per_cpu *cpu_buffer, struct buffer_page *page, struct list_head *list) { |