diff options
author | Colin Cross <ccross@android.com> | 2012-03-07 17:34:36 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-03-08 09:36:08 -0800 |
commit | a15d0b365e9bbf04dacb44fbe69d15f6594460e1 (patch) | |
tree | 9579eb4ad1e1fe752538cd815891e4c67900d61d /drivers/staging/android/persistent_ram.c | |
parent | 808d0387eb7df3f83352ca41f8c943cb3ed61246 (diff) | |
download | op-kernel-dev-a15d0b365e9bbf04dacb44fbe69d15f6594460e1.zip op-kernel-dev-a15d0b365e9bbf04dacb44fbe69d15f6594460e1.tar.gz |
staging: android: persistent_ram: add notrace to persistent_ram_write
Add the notrace attribute to persistent_ram_write and the
non-ecc functions that it calls to allow persistent_ram to
be used for ftracing (only when ecc is disabled).
CC: Greg KH <gregkh@linuxfoundation.org>
CC: Android Kernel Team <kernel-team@android.com>
Signed-off-by: Colin Cross <ccross@android.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/android/persistent_ram.c')
-rw-r--r-- | drivers/staging/android/persistent_ram.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/android/persistent_ram.c b/drivers/staging/android/persistent_ram.c index 3eb2fb4..e08f257 100644 --- a/drivers/staging/android/persistent_ram.c +++ b/drivers/staging/android/persistent_ram.c @@ -96,7 +96,7 @@ static inline ssize_t buffer_size_add_clamp(struct persistent_ram_zone *prz, return 0; } -static void persistent_ram_encode_rs8(struct persistent_ram_zone *prz, +static void notrace persistent_ram_encode_rs8(struct persistent_ram_zone *prz, uint8_t *data, size_t len, uint8_t *ecc) { int i; @@ -121,7 +121,7 @@ static int persistent_ram_decode_rs8(struct persistent_ram_zone *prz, NULL, 0, NULL, 0, NULL); } -static void persistent_ram_update_ecc(struct persistent_ram_zone *prz, +static void notrace persistent_ram_update_ecc(struct persistent_ram_zone *prz, unsigned int start, unsigned int count) { struct persistent_ram_buffer *buffer = prz->buffer; @@ -258,7 +258,7 @@ ssize_t persistent_ram_ecc_string(struct persistent_ram_zone *prz, return ret; } -static void persistent_ram_update(struct persistent_ram_zone *prz, +static void notrace persistent_ram_update(struct persistent_ram_zone *prz, const void *s, unsigned int start, unsigned int count) { struct persistent_ram_buffer *buffer = prz->buffer; @@ -288,7 +288,7 @@ persistent_ram_save_old(struct persistent_ram_zone *prz) memcpy(prz->old_log + size - start, &buffer->data[0], start); } -int persistent_ram_write(struct persistent_ram_zone *prz, +int notrace persistent_ram_write(struct persistent_ram_zone *prz, const void *s, unsigned int count) { int rem; |