From patchwork Thu Mar 8 01:34:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 7154 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 5909F23EA9 for ; Thu, 8 Mar 2012 01:34:55 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 1BF44A184F3 for ; Thu, 8 Mar 2012 01:34:55 +0000 (UTC) Received: by mail-iy0-f180.google.com with SMTP id e36so12685171iag.11 for ; Wed, 07 Mar 2012 17:34:54 -0800 (PST) Received: by 10.50.195.234 with SMTP id ih10mr3571279igc.50.1331170494821; Wed, 07 Mar 2012 17:34:54 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.53.18 with SMTP id k18csp158ibg; Wed, 7 Mar 2012 17:34:53 -0800 (PST) Received: by 10.68.239.195 with SMTP id vu3mr6739674pbc.49.1331170493243; Wed, 07 Mar 2012 17:34:53 -0800 (PST) Received: from e31.co.us.ibm.com (e31.co.us.ibm.com. [32.97.110.149]) by mx.google.com with ESMTPS id j10si2670456pbd.174.2012.03.07.17.34.52 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 07 Mar 2012 17:34:53 -0800 (PST) Received-SPF: pass (google.com: domain of jstultz@us.ibm.com designates 32.97.110.149 as permitted sender) client-ip=32.97.110.149; Authentication-Results: mx.google.com; spf=pass (google.com: domain of jstultz@us.ibm.com designates 32.97.110.149 as permitted sender) smtp.mail=jstultz@us.ibm.com Received: from /spool/local by e31.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 7 Mar 2012 18:34:52 -0700 Received: from d03dlp02.boulder.ibm.com (9.17.202.178) by e31.co.us.ibm.com (192.168.1.131) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 7 Mar 2012 18:34:50 -0700 Received: from d03relay03.boulder.ibm.com (d03relay03.boulder.ibm.com [9.17.195.228]) by d03dlp02.boulder.ibm.com (Postfix) with ESMTP id A6D533E40036; Wed, 7 Mar 2012 18:34:49 -0700 (MST) Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by d03relay03.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q281YnEV133176; Wed, 7 Mar 2012 18:34:49 -0700 Received: from d03av02.boulder.ibm.com (loopback [127.0.0.1]) by d03av02.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q281YmqA014456; Wed, 7 Mar 2012 18:34:49 -0700 Received: from kernel.beaverton.ibm.com (kernel.beaverton.ibm.com [9.47.67.96]) by d03av02.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q281Ym76014433; Wed, 7 Mar 2012 18:34:48 -0700 Received: by kernel.beaverton.ibm.com (Postfix, from userid 1056) id BB833C041B; Wed, 7 Mar 2012 17:34:46 -0800 (PST) From: John Stultz To: lkml Cc: Colin Cross , Greg KH , Android Kernel Team , John Stultz Subject: [PATCH 09/11] android: persistent_ram: add notrace to persistent_ram_write Date: Wed, 7 Mar 2012 17:34:36 -0800 Message-Id: <1331170478-30538-10-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.7.3.2.146.gca209 In-Reply-To: <1331170478-30538-1-git-send-email-john.stultz@linaro.org> References: <1331170478-30538-1-git-send-email-john.stultz@linaro.org> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12030801-7282-0000-0000-0000072F222F X-Gm-Message-State: ALoCoQle5AwlPDz8ZWH9bEBUIH2tLitytV/OfC0+i42eKm9cDMogBEABhfSP7Amn9iMbufIiq4xc From: Colin Cross 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 CC: Android Kernel Team Signed-off-by: Colin Cross Signed-off-by: John Stultz --- 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;