diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-01-09 05:02:31 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-01-09 05:02:31 +0100 |
| commit | dde86f41f4cb13015288abcff4706993c007f65d (patch) | |
| tree | 2e981cfa9eca8bddd5dcef63957f677ad2f7b15b /drivers/acpi/apei/erst.c | |
| parent | Documentation: HOWTO: Updates on subsystem trees, patchwork, -next (vs. -mm) ... (diff) | |
| parent | Linux 3.13-rc6 (diff) | |
| download | linux-dde86f41f4cb13015288abcff4706993c007f65d.tar.xz linux-dde86f41f4cb13015288abcff4706993c007f65d.zip | |
Merge v3.13-rc6 into char-misc-next
We want these fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/acpi/apei/erst.c')
| -rw-r--r-- | drivers/acpi/apei/erst.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/apei/erst.c b/drivers/acpi/apei/erst.c index 26311f23c824..cb1d557fc22c 100644 --- a/drivers/acpi/apei/erst.c +++ b/drivers/acpi/apei/erst.c @@ -942,6 +942,7 @@ static int erst_clearer(enum pstore_type_id type, u64 id, int count, static struct pstore_info erst_info = { .owner = THIS_MODULE, .name = "erst", + .flags = PSTORE_FLAGS_FRAGILE, .open = erst_open_pstore, .close = erst_close_pstore, .read = erst_reader, |