Pull pstorev4 into release branch

diff --combined drivers/acpi/apei/erst.c
index cf6db6b,22d70db..c02005a
--- 1/drivers/acpi/apei/erst.c
--- 2/drivers/acpi/apei/erst.c
+++ b/drivers/acpi/apei/erst.c
@@@ -34,6 -34,7 +34,7 @@@
  #include <linux/cper.h>
  #include <linux/nmi.h>
  #include <linux/hardirq.h>
+ #include <linux/pstore.h>
  #include <acpi/apei.h>
  
  #include "apei-internal.h"
@@@ -53,7 -54,7 +54,7 @@@
                                     sizeof(struct acpi_table_erst)))
  
  #define SPIN_UNIT             100                     /* 100ns */
 -/* Firmware should respond within 1 miliseconds */
 +/* Firmware should respond within 1 milliseconds */
  #define FIRMWARE_TIMEOUT      (1 * NSEC_PER_MSEC)
  #define FIRMWARE_MAX_STALL    50                      /* 50us */
  
@@@ -781,6 -782,128 +782,128 @@@ static int erst_check_table(struct acpi
        return 0;
  }
  
+ static size_t erst_reader(u64 *id, enum pstore_type_id *type,
+                      struct timespec *time);
+ static u64 erst_writer(enum pstore_type_id type, size_t size);
+ 
+ static struct pstore_info erst_info = {
+       .owner          = THIS_MODULE,
+       .name           = "erst",
+       .read           = erst_reader,
+       .write          = erst_writer,
+       .erase          = erst_clear
+ };
+ 
+ #define CPER_CREATOR_PSTORE                                           \
+       UUID_LE(0x75a574e3, 0x5052, 0x4b29, 0x8a, 0x8e, 0xbe, 0x2c,     \
+               0x64, 0x90, 0xb8, 0x9d)
+ #define CPER_SECTION_TYPE_DMESG                                               \
+       UUID_LE(0xc197e04e, 0xd545, 0x4a70, 0x9c, 0x17, 0xa5, 0x54,     \
+               0x94, 0x19, 0xeb, 0x12)
+ #define CPER_SECTION_TYPE_MCE                                         \
+       UUID_LE(0xfe08ffbe, 0x95e4, 0x4be7, 0xbc, 0x73, 0x40, 0x96,     \
+               0x04, 0x4a, 0x38, 0xfc)
+ 
+ struct cper_pstore_record {
+       struct cper_record_header hdr;
+       struct cper_section_descriptor sec_hdr;
+       char data[];
+ } __packed;
+ 
+ static size_t erst_reader(u64 *id, enum pstore_type_id *type,
+                      struct timespec *time)
+ {
+       int rc;
+       ssize_t len;
+       unsigned long flags;
+       u64 record_id;
+       struct cper_pstore_record *rcd = (struct cper_pstore_record *)
+                                       (erst_info.buf - sizeof(*rcd));
+ 
+       if (erst_disable)
+               return -ENODEV;
+ 
+       raw_spin_lock_irqsave(&erst_lock, flags);
+ skip:
+       rc = __erst_get_next_record_id(&record_id);
+       if (rc) {
+               raw_spin_unlock_irqrestore(&erst_lock, flags);
+               return rc;
+       }
+       /* no more record */
+       if (record_id == APEI_ERST_INVALID_RECORD_ID) {
+               raw_spin_unlock_irqrestore(&erst_lock, flags);
+               return 0;
+       }
+ 
+       len = __erst_read(record_id, &rcd->hdr, sizeof(*rcd) +
+                         erst_erange.size);
+       if (uuid_le_cmp(rcd->hdr.creator_id, CPER_CREATOR_PSTORE) != 0)
+               goto skip;
+       raw_spin_unlock_irqrestore(&erst_lock, flags);
+ 
+       *id = record_id;
+       if (uuid_le_cmp(rcd->sec_hdr.section_type,
+                       CPER_SECTION_TYPE_DMESG) == 0)
+               *type = PSTORE_TYPE_DMESG;
+       else if (uuid_le_cmp(rcd->sec_hdr.section_type,
+                            CPER_SECTION_TYPE_MCE) == 0)
+               *type = PSTORE_TYPE_MCE;
+       else
+               *type = PSTORE_TYPE_UNKNOWN;
+ 
+       if (rcd->hdr.validation_bits & CPER_VALID_TIMESTAMP)
+               time->tv_sec = rcd->hdr.timestamp;
+       else
+               time->tv_sec = 0;
+       time->tv_nsec = 0;
+ 
+       return len - sizeof(*rcd);
+ }
+ 
+ static u64 erst_writer(enum pstore_type_id type, size_t size)
+ {
+       struct cper_pstore_record *rcd = (struct cper_pstore_record *)
+                                       (erst_info.buf - sizeof(*rcd));
+ 
+       memset(rcd, 0, sizeof(*rcd));
+       memcpy(rcd->hdr.signature, CPER_SIG_RECORD, CPER_SIG_SIZE);
+       rcd->hdr.revision = CPER_RECORD_REV;
+       rcd->hdr.signature_end = CPER_SIG_END;
+       rcd->hdr.section_count = 1;
+       rcd->hdr.error_severity = CPER_SEV_FATAL;
+       /* timestamp valid. platform_id, partition_id are invalid */
+       rcd->hdr.validation_bits = CPER_VALID_TIMESTAMP;
+       rcd->hdr.timestamp = get_seconds();
+       rcd->hdr.record_length = sizeof(*rcd) + size;
+       rcd->hdr.creator_id = CPER_CREATOR_PSTORE;
+       rcd->hdr.notification_type = CPER_NOTIFY_MCE;
+       rcd->hdr.record_id = cper_next_record_id();
+       rcd->hdr.flags = CPER_HW_ERROR_FLAGS_PREVERR;
+ 
+       rcd->sec_hdr.section_offset = sizeof(*rcd);
+       rcd->sec_hdr.section_length = size;
+       rcd->sec_hdr.revision = CPER_SEC_REV;
+       /* fru_id and fru_text is invalid */
+       rcd->sec_hdr.validation_bits = 0;
+       rcd->sec_hdr.flags = CPER_SEC_PRIMARY;
+       switch (type) {
+       case PSTORE_TYPE_DMESG:
+               rcd->sec_hdr.section_type = CPER_SECTION_TYPE_DMESG;
+               break;
+       case PSTORE_TYPE_MCE:
+               rcd->sec_hdr.section_type = CPER_SECTION_TYPE_MCE;
+               break;
+       default:
+               return -EINVAL;
+       }
+       rcd->sec_hdr.section_severity = CPER_SEV_FATAL;
+ 
+       erst_write(&rcd->hdr);
+ 
+       return rcd->hdr.record_id;
+ }
+ 
  static int __init erst_init(void)
  {
        int rc = 0;
@@@ -788,6 -911,7 +911,7 @@@
        struct apei_exec_context ctx;
        struct apei_resources erst_resources;
        struct resource *r;
+       char *buf;
  
        if (acpi_disabled)
                goto err;
@@@ -854,6 -978,18 +978,18 @@@
        if (!erst_erange.vaddr)
                goto err_release_erange;
  
+       buf = kmalloc(erst_erange.size, GFP_KERNEL);
+       mutex_init(&erst_info.buf_mutex);
+       if (buf) {
+               erst_info.buf = buf + sizeof(struct cper_pstore_record);
+               erst_info.bufsize = erst_erange.size -
+                                   sizeof(struct cper_pstore_record);
+               if (pstore_register(&erst_info)) {
+                       pr_info(ERST_PFX "Could not register with persistent store\n");
+                       kfree(buf);
+               }
+       }
+ 
        pr_info(ERST_PFX
        "Error Record Serialization Table (ERST) support is initialized.\n");
  

diff --combined fs/Kconfig
index 3db9caa,2bbe47f..efb7d4e
--- 1/fs/Kconfig
--- 2/fs/Kconfig
+++ b/fs/Kconfig
@@@ -30,6 -30,15 +30,6 @@@ config FS_MBCACH
  source "fs/reiserfs/Kconfig"
  source "fs/jfs/Kconfig"
  
 -config FS_POSIX_ACL
 -# Posix ACL utility routines (for now, only ext2/ext3/jfs/reiserfs/nfs4)
 -#
 -# NOTE: you can implement Posix ACLs without these helpers (XFS does).
 -#     Never use this symbol for ifdefs.
 -#
 -      bool
 -      default n
 -
  source "fs/xfs/Kconfig"
  source "fs/gfs2/Kconfig"
  source "fs/ocfs2/Kconfig"
@@@ -38,19 -47,11 +38,19 @@@ source "fs/nilfs2/Kconfig
  
  endif # BLOCK
  
 +# Posix ACL utility routines
 +#
 +# Note: Posix ACLs can be implemented without these helpers.  Never use
 +# this symbol for ifdefs in core code.
 +#
 +config FS_POSIX_ACL
 +      def_bool n
 +
  config EXPORTFS
        tristate
  
  config FILE_LOCKING
 -      bool "Enable POSIX file locking API" if EMBEDDED
 +      bool "Enable POSIX file locking API" if EXPERT
        default y
        help
          This option enables standard file locking support, required
@@@ -187,6 -188,7 +187,7 @@@ source "fs/omfs/Kconfig
  source "fs/hpfs/Kconfig"
  source "fs/qnx4/Kconfig"
  source "fs/romfs/Kconfig"
+ source "fs/pstore/Kconfig"
  source "fs/sysv/Kconfig"
  source "fs/ufs/Kconfig"
  source "fs/exofs/Kconfig"

diff --combined include/linux/magic.h
index 62730ea,e87fd5a..6cfe344
--- 1/include/linux/magic.h
--- 2/include/linux/magic.h
+++ b/include/linux/magic.h
@@@ -16,7 -16,6 +16,7 @@@
  #define TMPFS_MAGIC           0x01021994
  #define HUGETLBFS_MAGIC       0x958458f6      /* some random number */
  #define SQUASHFS_MAGIC                0x73717368
 +#define ECRYPTFS_SUPER_MAGIC  0xf15f
  #define EFS_SUPER_MAGIC               0x414A53
  #define EXT2_SUPER_MAGIC      0xEF53
  #define EXT3_SUPER_MAGIC      0xEF53
@@@ -27,6 -26,7 +27,7 @@@
  #define ISOFS_SUPER_MAGIC     0x9660
  #define JFFS2_SUPER_MAGIC     0x72b6
  #define ANON_INODE_FS_MAGIC   0x09041934
+ #define PSTOREFS_MAGIC                0x6165676C
  
  #define MINIX_SUPER_MAGIC     0x137F          /* original minix fs */
  #define MINIX_SUPER_MAGIC2    0x138F          /* minix fs, 30 char names */