From 3b1f069fc365f2a3664080f3684e94968ede60ca Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 13 Nov 2008 14:58:31 +0100
Subject: [PATCH] --- yaml --- r: 119156 b: refs/heads/master c:
 ee51a1de7e3837577412be269e0100038068e691 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/kernel/trace/ring_buffer.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0732cd8fc11d..1a7e6a2d5624 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 47e74f2ba8fbf9fb1378e2524e6cfdc2fb37f160
+refs/heads/master: ee51a1de7e3837577412be269e0100038068e691
diff --git a/trunk/kernel/trace/ring_buffer.c b/trunk/kernel/trace/ring_buffer.c
index 231db209fa82..036456cbb4f7 100644
--- a/trunk/kernel/trace/ring_buffer.c
+++ b/trunk/kernel/trace/ring_buffer.c
@@ -538,6 +538,12 @@ int ring_buffer_resize(struct ring_buffer *buffer, unsigned long size)
 	LIST_HEAD(pages);
 	int i, cpu;
 
+	/*
+	 * Always succeed at resizing a non-existent buffer:
+	 */
+	if (!buffer)
+		return size;
+
 	size = DIV_ROUND_UP(size, BUF_PAGE_SIZE);
 	size *= BUF_PAGE_SIZE;
 	buffer_size = buffer->pages * BUF_PAGE_SIZE;