From e7c8a7f35ce04fe36080a0c10f0a695917bffa12 Mon Sep 17 00:00:00 2001
From: Anton Vorontsov <anton.vorontsov@linaro.org>
Date: Tue, 17 Jul 2012 19:49:37 -0700
Subject: [PATCH] --- yaml --- r: 330529 b: refs/heads/master c:
 242030365eacb649161023a3a024373198c34d59 h: refs/heads/master i:   330527:
 f115d391e972cf6db50e83c264edfab95a97a24e v: v3

---
 [refs]                |  2 +-
 trunk/fs/pstore/ram.c | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index bdcfcd6bc78b..bbf1957a5196 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0427193b691edc81c846c7d0ebd2561cae8709d8
+refs/heads/master: 242030365eacb649161023a3a024373198c34d59
diff --git a/trunk/fs/pstore/ram.c b/trunk/fs/pstore/ram.c
index fba8c7256929..91016049e551 100644
--- a/trunk/fs/pstore/ram.c
+++ b/trunk/fs/pstore/ram.c
@@ -32,6 +32,7 @@
 #include <linux/ioport.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
+#include <linux/compiler.h>
 #include <linux/pstore_ram.h>
 
 #define RAMOOPS_KERNMSG_HDR "===="
@@ -181,12 +182,11 @@ static size_t ramoops_write_kmsg_hdr(struct persistent_ram_zone *prz)
 	return len;
 }
 
-
-static int ramoops_pstore_write_buf(enum pstore_type_id type,
-				    enum kmsg_dump_reason reason,
-				    u64 *id, unsigned int part,
-				    const char *buf, size_t size,
-				    struct pstore_info *psi)
+static int notrace ramoops_pstore_write_buf(enum pstore_type_id type,
+					    enum kmsg_dump_reason reason,
+					    u64 *id, unsigned int part,
+					    const char *buf, size_t size,
+					    struct pstore_info *psi)
 {
 	struct ramoops_context *cxt = psi->data;
 	struct persistent_ram_zone *prz = cxt->przs[cxt->dump_write_cnt];