Merge tag 'v3.10.65' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / include / linux / pstore_ram.h

diff --git a/include/linux/pstore_ram.h b/include/linux/pstore_ram.h
index 9e370618352a1bd86ccc6ced2d5ae3af0cc371cb..17baad3a0c57c178ba35f2fc71b67bda7aee946f 100644 (file)
--- 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);
 
@@ -78,6 +79,7 @@ void ramoops_console_write_buf(const char *buf, size_t size);
 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;