diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-17 19:57:55 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-17 19:57:55 -0400 |
| commit | 5cd0911a9e0e408f28079a5e36a981217bf47520 (patch) | |
| tree | 39dd64f418e5cd0faa52ac8a5360243038c25c10 /include | |
| parent | 1ca80a0a3e37d847f3cd6120ca5eb35b39a9a152 (diff) | |
| parent | 764fd639d794a1c0b0d203b19d1bef0451c23fb1 (diff) | |
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, | |||
| 76 | 76 | ||
| 77 | struct ramoops_platform_data { | 77 | struct ramoops_platform_data { |
| 78 | unsigned long mem_size; | 78 | unsigned long mem_size; |
| 79 | unsigned long mem_address; | 79 | phys_addr_t mem_address; |
| 80 | unsigned int mem_type; | 80 | unsigned int mem_type; |
| 81 | unsigned long record_size; | 81 | unsigned long record_size; |
| 82 | unsigned long console_size; | 82 | unsigned long console_size; |