diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-12 22:34:13 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-12 22:34:13 +0300 |
| commit | 6ce4436c9cbe903af935291aa219fd6f4c85722d (patch) | |
| tree | 43dedf78042c619d8b5b0a77d6937eb22805d874 /include/linux | |
| parent | bdeb03cada1c305346505c48e5b1dab37e9acc4e (diff) | |
| parent | 027bc8b08242c59e19356b4b2c189f2d849ab660 (diff) | |
| download | linux-6ce4436c9cbe903af935291aa219fd6f4c85722d.tar.xz | |
Merge tag 'please-pull-morepstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
Pull pstore update #2 from Tony Luck:
"Couple of pstore-ram enhancements to allow use of different memory
attributes"
* tag 'please-pull-morepstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
pstore-ram: Allow optional mapping with pgprot_noncached
pstore-ram: Fix hangs by using write-combine mappings
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/pstore_ram.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/pstore_ram.h b/include/linux/pstore_ram.h index 9974975d40db..4af3fdc85b01 100644 --- a/include/linux/pstore_ram.h +++ b/include/linux/pstore_ram.h @@ -53,7 +53,8 @@ struct persistent_ram_zone { }; struct persistent_ram_zone *persistent_ram_new(phys_addr_t start, size_t size, - u32 sig, struct persistent_ram_ecc_info *ecc_info); + u32 sig, struct persistent_ram_ecc_info *ecc_info, + unsigned int memtype); void persistent_ram_free(struct persistent_ram_zone *prz); void persistent_ram_zap(struct persistent_ram_zone *prz); @@ -76,6 +77,7 @@ ssize_t persistent_ram_ecc_string(struct persistent_ram_zone *prz, struct ramoops_platform_data { unsigned long mem_size; unsigned long mem_address; + unsigned int mem_type; unsigned long record_size; unsigned long console_size; unsigned long ftrace_size; |