From: John Stultz <john.stultz@linaro.org>
To: lkml <linux-kernel@vger.kernel.org>
Cc: Colin Cross <ccross@android.com>,
Greg KH <gregkh@linuxfoundation.org>,
Android Kernel Team <kernel-team@android.com>,
John Stultz <john.stultz@linaro.org>
Subject: [PATCH 09/11] android: persistent_ram: add notrace to persistent_ram_write
Date: Wed, 7 Mar 2012 17:34:36 -0800 [thread overview]
Message-ID: <1331170478-30538-10-git-send-email-john.stultz@linaro.org> (raw)
In-Reply-To: <1331170478-30538-1-git-send-email-john.stultz@linaro.org>
From: Colin Cross <ccross@android.com>
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>
---
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;
--
1.7.3.2.146.gca209
next prev parent reply other threads:[~2012-03-08 1:35 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-08 1:34 [PATCH 00/11] staging: Android updates (take 2) John Stultz
2012-03-08 1:34 ` [PATCH 01/11] android: ram_console: set CON_ANYTIME console flag John Stultz
2012-03-08 1:34 ` [PATCH 02/11] android: ram_console: move footer strings John Stultz
2012-03-08 1:34 ` [PATCH 03/11] android: ram_console: drop early buffer support John Stultz
2012-03-08 1:34 ` [PATCH 04/11] android: ram_console: drop verbose ram_console support John Stultz
2012-03-08 1:34 ` [PATCH 05/11] android: ram_console: split out persistent ram John Stultz
2012-03-08 2:42 ` Greg KH
2012-03-08 3:06 ` Colin Cross
2012-03-08 17:33 ` Greg KH
2012-03-08 18:24 ` Colin Cross
2012-03-08 18:39 ` Greg KH
2012-03-08 3:59 ` John Stultz
2012-03-08 17:33 ` Greg KH
2012-03-08 1:34 ` [PATCH 06/11] android: persistent_ram: refactor ecc support John Stultz
2012-03-08 1:34 ` [PATCH 07/11] android: persistent_ram: handle reserving and mapping memory John Stultz
2012-03-08 1:34 ` [PATCH 08/11] android: persistent_ram: make persistent_ram_write atomic John Stultz
2012-03-08 1:34 ` John Stultz [this message]
2012-03-08 1:34 ` [PATCH 10/11] android: staging: ram_console: fix crash in ram_console_late_init John Stultz
2012-03-08 1:34 ` [PATCH 11/11] android: ram_console: honor dmesg_restrict John Stultz
2012-03-08 2:42 ` [PATCH 00/11] staging: Android updates (take 2) Greg KH
2012-03-08 9:08 ` [PATCH] staging: ram_console: Fix section mismatches Stephen Boyd
2012-03-08 17:56 ` Greg KH
2012-03-08 18:12 ` Stephen Boyd
2012-03-08 18:23 ` Greg KH
2012-03-08 18:34 ` Stephen Boyd
2012-03-08 18:43 ` Greg KH
2012-03-08 19:33 ` Stephen Boyd
2012-03-08 19:41 ` Stephen Boyd
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1331170478-30538-10-git-send-email-john.stultz@linaro.org \
--to=john.stultz@linaro.org \
--cc=ccross@android.com \
--cc=gregkh@linuxfoundation.org \
--cc=kernel-team@android.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®