diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-17 16:57:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-17 16:57:55 -0700 |
| commit | 5cd0911a9e0e408f28079a5e36a981217bf47520 (patch) | |
| tree | 39dd64f418e5cd0faa52ac8a5360243038c25c10 /fs | |
| parent | 1ca80a0a3e37d847f3cd6120ca5eb35b39a9a152 (diff) | |
| parent | 764fd639d794a1c0b0d203b19d1bef0451c23fb1 (diff) | |
| download | linux-5cd0911a9e0e408f28079a5e36a981217bf47520.tar.gz linux-5cd0911a9e0e408f28079a5e36a981217bf47520.tar.bz2 linux-5cd0911a9e0e408f28079a5e36a981217bf47520.zip | |
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
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/pstore/ram.c | 4 |
1 files changed, 2 insertions, 2 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"); |