summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWiebe, Wladislav (Nokia - DE/Ulm) <wladislav.wiebe@nokia.com>2015-11-13 12:10:05 +0000
committerTony Luck <tony.luck@intel.com>2016-03-10 09:43:36 -0800
commit764fd639d794a1c0b0d203b19d1bef0451c23fb1 (patch)
tree7aa3ddd616ea3da4a8f1e4b6d4d0b88d79f409e4
parentf6cede5b49e822ebc41a099fe41ab4989f64e2cb (diff)
downloadlinux-764fd639d794a1c0b0d203b19d1bef0451c23fb1.tar.bz2
pstore: Add support for 64 Bit address space
Some architectures have their reserved RAM in 64 Bit address space. Therefore convert mem_address module parameter to ullong. Signed-off-by: Wladislav Wiebe <wladislav.wiebe@nokia.com> Acked-by: Kees Cook <keescook@chromium.org> Signed-off-by: Tony Luck <tony.luck@intel.com>
-rw-r--r--fs/pstore/ram.c4
-rw-r--r--include/linux/pstore_ram.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c
index 319c3a60cfa5..bd9812e83461 100644
--- a/fs/pstore/ram.c
+++ b/fs/pstore/ram.c
@@ -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");
diff --git a/include/linux/pstore_ram.h b/include/linux/pstore_ram.h
index 9c9d6c154c8e..4660aaa3195e 100644
--- a/include/linux/pstore_ram.h
+++ b/include/linux/pstore_ram.h
@@ -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;