diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-13 19:57:09 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-13 19:57:09 -0400 |
commit | 89a86a2da30a6a90dda719874092905cd762b7ef (patch) | |
tree | 140a289a990e7810e9c365bce304af1e065ca649 /include | |
parent | 71f882fe71823c54ae095ce29ce050f814eefdbc (diff) | |
parent | 364ed2f4653d7c86ebedcc116a9cb34fd272867c (diff) |
Merge branch 'staging-linus' into staging-next
We need this for the pstore fixes that went into the staging-linus branch, so
that things apply properly for the pstore/android code merge.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/pstore_ram.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/pstore_ram.h b/include/linux/pstore_ram.h index 7ed7fd4dba49..3b823d49a85a 100644 --- a/include/linux/pstore_ram.h +++ b/include/linux/pstore_ram.h | |||
@@ -69,12 +69,14 @@ struct persistent_ram_zone * __init persistent_ram_new(phys_addr_t start, | |||
69 | size_t size, | 69 | size_t size, |
70 | bool ecc); | 70 | bool ecc); |
71 | void persistent_ram_free(struct persistent_ram_zone *prz); | 71 | void persistent_ram_free(struct persistent_ram_zone *prz); |
72 | void persistent_ram_zap(struct persistent_ram_zone *prz); | ||
72 | struct persistent_ram_zone *persistent_ram_init_ringbuffer(struct device *dev, | 73 | struct persistent_ram_zone *persistent_ram_init_ringbuffer(struct device *dev, |
73 | bool ecc); | 74 | bool ecc); |
74 | 75 | ||
75 | int persistent_ram_write(struct persistent_ram_zone *prz, const void *s, | 76 | int persistent_ram_write(struct persistent_ram_zone *prz, const void *s, |
76 | unsigned int count); | 77 | unsigned int count); |
77 | 78 | ||
79 | void persistent_ram_save_old(struct persistent_ram_zone *prz); | ||
78 | size_t persistent_ram_old_size(struct persistent_ram_zone *prz); | 80 | size_t persistent_ram_old_size(struct persistent_ram_zone *prz); |
79 | void *persistent_ram_old(struct persistent_ram_zone *prz); | 81 | void *persistent_ram_old(struct persistent_ram_zone *prz); |
80 | void persistent_ram_free_old(struct persistent_ram_zone *prz); | 82 | void persistent_ram_free_old(struct persistent_ram_zone *prz); |