Merge remote-tracking branch 'lsk/v3.10/topic/aosp' into linux-linaro-lsk-android

1 files changed, 6 insertions, 0 deletions

diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c
index 1376e5a8f0d6..058f17f0b466 100644
--- a/fs/pstore/ram.c
+++ b/fs/pstore/ram.c
@@ -377,6 +377,12 @@ static int ramoops_init_prz(struct device *dev, struct ramoops_context *cxt,
 	return 0;
 }
 
+void notrace ramoops_console_write_buf(const char *buf, size_t size)
+{
+	struct ramoops_context *cxt = &oops_cxt;
+	persistent_ram_write(cxt->cprz, buf, size);
+}
+
 static int ramoops_probe(struct platform_device *pdev)
 {
 	struct device *dev = &pdev->dev;