diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-24 19:10:47 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-24 19:10:47 +0100 |
| commit | b86b75ec57c381f32090a5bc61252f84f955c094 (patch) | |
| tree | 69afa8a88979bfa8fbdbcb106ddf8fe3ee5da99f /drivers/acpi/apei/erst.c | |
| parent | tty: an overflow of multiplication in drivers/tty/cyclades.c (diff) | |
| parent | Linux 3.13-rc5 (diff) | |
| download | linux-b86b75ec57c381f32090a5bc61252f84f955c094.tar.xz linux-b86b75ec57c381f32090a5bc61252f84f955c094.zip | |
Merge 3.13-rc5 into tty-next
We need the tty 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, |