diff options
| author | Ishan Mittal <imittal@nvidia.com> | 2014-05-15 18:21:20 +0530 |
|---|---|---|
| committer | Ishan Mittal <imittal@nvidia.com> | 2014-05-29 12:41:59 +0530 |
| commit | 75c1032e7b6215de41e451a01033a342372105d4 (patch) | |
| tree | 54fe571dd5a1c1e69f93c219e1cdf9c072e87d88 /fs | |
| parent | c436d07ff6b15f6540e7468c7c793ef15e55a921 (diff) | |
| parent | c4db79235d21ba1dcd10d42154910ac1ba8e3ed3 (diff) | |
Merge branch 'android-3.10' into rel-21
Bug 200004122
Bug 1511804
This merge takes AOSP commits from android-3.10 branch
Change-Id: I07ec2468114db0366d63777142c9572bbfadbc45
Signed-off-by: Ishan Mittal <imittal@nvidia.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/pstore/ram.c | 6 |
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; |