summaryrefslogtreecommitdiff
path: root/fs/pstore
diff options
context:
space:
mode:
authorAnton Vorontsov <anton.vorontsov@linaro.org>2012-07-17 19:49:37 -0700
committerAnton Vorontsov <anton.vorontsov@linaro.org>2012-08-04 16:16:47 -0700
commit242030365eacb649161023a3a024373198c34d59 (patch)
tree7606527669a61be1162f9f99218f550b85c589e3 /fs/pstore
parent0427193b691edc81c846c7d0ebd2561cae8709d8 (diff)
downloadlinux-3.10-242030365eacb649161023a3a024373198c34d59.tar.gz
linux-3.10-242030365eacb649161023a3a024373198c34d59.tar.bz2
linux-3.10-242030365eacb649161023a3a024373198c34d59.zip
pstore/ram: Mark ramoops_pstore_write_buf() as notrace
write_buf() should be marked as notrace, otherwise it is prone to recursion. Though, yet the issue is never triggered in real life, because we run inside the function tracer, where ftrace does its own recurse protection. But it's still no good, plus soon we might switch to our own tracer ops, and then the issue will be fatal. So, let's fix it. Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
Diffstat (limited to 'fs/pstore')
-rw-r--r--fs/pstore/ram.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c
index fba8c725692..91016049e55 100644
--- a/fs/pstore/ram.c
+++ b/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];