Skip to content

Commit fc86cb0

Browse files
committed
fs: pstore: Import xiaomi pstore changes
1 parent e45529a commit fc86cb0

2 files changed

Lines changed: 14 additions & 4 deletions

File tree

fs/pstore/ram.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ module_param(record_size, ulong, 0400);
4343
MODULE_PARM_DESC(record_size,
4444
"size of each dump done on oops/panic");
4545

46-
static ulong ramoops_console_size = MIN_MEM_SIZE;
46+
static ulong ramoops_console_size = 512*1024UL;
4747
module_param_named(console_size, ramoops_console_size, ulong, 0400);
4848
MODULE_PARM_DESC(console_size, "size of kernel console log");
4949

@@ -55,12 +55,12 @@ static ulong ramoops_pmsg_size = MIN_MEM_SIZE;
5555
module_param_named(pmsg_size, ramoops_pmsg_size, ulong, 0400);
5656
MODULE_PARM_DESC(pmsg_size, "size of user space message log");
5757

58-
static ulong mem_address;
58+
static ulong mem_address = 0x9ff00000;
5959
module_param(mem_address, ulong, 0400);
6060
MODULE_PARM_DESC(mem_address,
6161
"start of reserved RAM used to store oops/panic logs");
6262

63-
static ulong mem_size;
63+
static ulong mem_size = 0x100000;
6464
module_param(mem_size, ulong, 0400);
6565
MODULE_PARM_DESC(mem_size,
6666
"size of reserved RAM used to store oops/panic logs");

fs/pstore/ram_core.c

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,11 +298,21 @@ ssize_t persistent_ram_ecc_string(struct persistent_ram_zone *prz,
298298
return ret;
299299
}
300300

301+
static void *memcpy_pstore(void *dest, const void *src, size_t count)
302+
{
303+
char *tmp = dest;
304+
const char *s = src;
305+
306+
while (count--)
307+
*tmp++ = *s++;
308+
return dest;
309+
}
310+
301311
static void notrace persistent_ram_update(struct persistent_ram_zone *prz,
302312
const void *s, unsigned int start, unsigned int count)
303313
{
304314
struct persistent_ram_buffer *buffer = prz->buffer;
305-
memcpy(buffer->data + start, s, count);
315+
memcpy_pstore(buffer->data + start, s, count);
306316
persistent_ram_update_ecc(prz, start, count);
307317
}
308318

0 commit comments

Comments
 (0)