Skip to content

Commit

Permalink
staging: android: persistent_ram: add notrace to persistent_ram_write
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Colin Cross authored and Greg Kroah-Hartman committed Mar 8, 2012
1 parent 808d038 commit a15d0b3
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/staging/android/persistent_ram.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit a15d0b3

Please sign in to comment.