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 /include | |
| parent | Merge tag 'gfs2-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | pstore: Add support for 64 Bit address space (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 'include')
| -rw-r--r-- | include/linux/pstore_ram.h | 2 |
1 files changed, 1 insertions, 1 deletions
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; |