2 files changed, 11 insertions, 7 deletions

diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h
index 26ee56c80dc7..b60de92e2edc 100644
--- a/include/linux/huge_mm.h
+++ b/include/linux/huge_mm.h
@@ -60,9 +60,9 @@ extern pmd_t *page_check_address_pmd(struct page *page,
 #define HPAGE_PMD_NR (1<<HPAGE_PMD_ORDER)
 
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
-#define HPAGE_PMD_SHIFT HPAGE_SHIFT
-#define HPAGE_PMD_MASK HPAGE_MASK
-#define HPAGE_PMD_SIZE HPAGE_SIZE
+#define HPAGE_PMD_SHIFT PMD_SHIFT
+#define HPAGE_PMD_SIZE  ((1UL) << HPAGE_PMD_SHIFT)
+#define HPAGE_PMD_MASK  (~(HPAGE_PMD_SIZE - 1))
 
 extern bool is_vma_temporary_stack(struct vm_area_struct *vma);
 
diff --git a/include/linux/pstore.h b/include/linux/pstore.h
index 75d01760c911..4aa80ba830a2 100644
--- a/include/linux/pstore.h
+++ b/include/linux/pstore.h
@@ -35,6 +35,10 @@ enum pstore_type_id {
         PSTORE_TYPE_MCE         = 1,
         PSTORE_TYPE_CONSOLE     = 2,
         PSTORE_TYPE_FTRACE      = 3,
+        /* PPC64 partition types */
+        PSTORE_TYPE_PPC_RTAS    = 4,
+        PSTORE_TYPE_PPC_OF      = 5,
+        PSTORE_TYPE_PPC_COMMON  = 6,
         PSTORE_TYPE_UNKNOWN     = 255
 };
 
@@ -54,12 +58,12 @@ struct pstore_info {
                         struct pstore_info *psi);
         int             (*write)(enum pstore_type_id type,
                         enum kmsg_dump_reason reason, u64 *id,
-                        unsigned int part, int count, size_t size,
-                        struct pstore_info *psi);
+                        unsigned int part, int count, size_t hsize,
+                        size_t size, struct pstore_info *psi);
         int             (*write_buf)(enum pstore_type_id type,
                         enum kmsg_dump_reason reason, u64 *id,
-                        unsigned int part, const char *buf, size_t size,
-                        struct pstore_info *psi);
+                        unsigned int part, const char *buf, size_t hsize,
+                        size_t size, struct pstore_info *psi);
         int             (*erase)(enum pstore_type_id type, u64 id,
                         int count, struct timespec time,
                         struct pstore_info *psi);