Subject: [merged] pstore-clarify-clearing-of-_read_cnt-in-ramoops_context.patch removed from -mm tree
To: shuox.liu@xxxxxxxxx,ccross@xxxxxxxxxxx,keescook@xxxxxxxxxxxx,tony.luck@xxxxxxxxx,yanmin_zhang@xxxxxxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Thu, 20 Mar 2014 12:42:44 -0700
The patch titled
Subject: pstore: clarify clearing of _read_cnt in ramoops_context
has been removed from the -mm tree. Its filename was
pstore-clarify-clearing-of-_read_cnt-in-ramoops_context.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Liu ShuoX <shuox.liu@xxxxxxxxx>
Subject: pstore: clarify clearing of _read_cnt in ramoops_context
*_read_cnt in ramoops_context need to be cleared during pstore ->open to
support mutli times getting the records. The patch added missed
ftrace_read_cnt clearing and removed duplicate clearing in ramoops_probe.
Signed-off-by: Liu ShuoX <shuox.liu@xxxxxxxxx>
Cc: "Zhang, Yanmin" <yanmin_zhang@xxxxxxxxxxxxxxx>
Cc: Colin Cross <ccross@xxxxxxxxxxx>
Cc: Kees Cook <keescook@xxxxxxxxxxxx>
Cc: "Luck, Tony" <tony.luck@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/pstore/ram.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff -puN fs/pstore/ram.c~pstore-clarify-clearing-of-_read_cnt-in-ramoops_context fs/pstore/ram.c
--- a/fs/pstore/ram.c~pstore-clarify-clearing-of-_read_cnt-in-ramoops_context
+++ a/fs/pstore/ram.c
@@ -86,6 +86,7 @@ struct ramoops_context {
struct persistent_ram_ecc_info ecc_info;
unsigned int max_dump_cnt;
unsigned int dump_write_cnt;
+ /* _read_cnt need clear on ramoops_pstore_open */
unsigned int dump_read_cnt;
unsigned int console_read_cnt;
unsigned int ftrace_read_cnt;
@@ -101,6 +102,7 @@ static int ramoops_pstore_open(struct ps
cxt->dump_read_cnt = 0;
cxt->console_read_cnt = 0;
+ cxt->ftrace_read_cnt = 0;
return 0;
}
@@ -428,7 +430,6 @@ static int ramoops_probe(struct platform
if (pdata->ftrace_size && !is_power_of_2(pdata->ftrace_size))
pdata->ftrace_size = rounddown_pow_of_two(pdata->ftrace_size);
- cxt->dump_read_cnt = 0;
cxt->size = pdata->mem_size;
cxt->phys_addr = pdata->mem_address;
cxt->record_size = pdata->record_size;
_
Patches currently in -mm which might be from shuox.liu@xxxxxxxxx are
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
