Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5cd0911a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux 

Pull pstore update from Tony Luck:
 "Allow ram backend to be configured with addresses above 4GB"

* tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  pstore: Add support for 64 Bit address space
parents 1ca80a0a 764fd639

fs/pstore/ram.c

+2 −2
Original line number Diff line number Diff line
@@ -55,8 +55,8 @@ static ulong ramoops_pmsg_size = MIN_MEM_SIZE; 
module_param_named(pmsg_size, ramoops_pmsg_size, ulong, 0400);

MODULE_PARM_DESC(pmsg_size, "size of user space message log");



static ulong mem_address;

module_param(mem_address, ulong, 0400);

static unsigned long long mem_address;

module_param(mem_address, ullong, 0400);

MODULE_PARM_DESC(mem_address,

		"start of reserved RAM used to store oops/panic logs");

include/linux/pstore_ram.h

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ ssize_t persistent_ram_ecc_string(struct persistent_ram_zone *prz, 


struct ramoops_platform_data {

	unsigned long	mem_size;

	unsigned long	mem_address;

	phys_addr_t	mem_address;

	unsigned int	mem_type;

	unsigned long	record_size;

	unsigned long	console_size;