From patchwork Wed Feb 5 00:08:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 24149 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f71.google.com (mail-oa0-f71.google.com [209.85.219.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 7D92A202FA for ; Wed, 5 Feb 2014 00:09:16 +0000 (UTC) Received: by mail-oa0-f71.google.com with SMTP id g12sf41576002oah.2 for ; Tue, 04 Feb 2014 16:09:15 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=xjQCmdwgQ0VaqjkHV/sksI18efD199VGTGBsKQrWEb8=; b=R+qW2EuBE7EEL8XvkinPKONELNmEOhVwRNH/gC2K1zpMisWVqLi63TzjkTd9us4ZWe nnSNQ7ovLqCT9SfO3ZyIqb0k4Pl3CmOSWCOQoH+TdQmHaSe3TY2+XJ5iov+h8sMPnf8L X6jc1Z6H25H8VdJuIUuhCtuNzQCmdHR4yF9gLPV2YzxFBAMt5r+rfwvkWwaBUsWQLp+X ZzKiXJgXpn8PzFes9KBIK1fZ/B+4Ln8gIw2BtnlJ5Cq2WVho4WZil1DaQIHWSfKeWZK6 3R0YWS3XIGkpCTtyWkl1fLlqDprYHs5QnusfWIHjM3W4AqNLJhEGO5zVIU/aDEnJIU8g XHIw== X-Gm-Message-State: ALoCoQnnNcxN1s7Rf63uXEqNGyxNMxnrRV6C0ayJcq7nVw5l+JP//PW7aeBeH7fU82wL0rIUfuMr X-Received: by 10.182.24.134 with SMTP id u6mr17199377obf.24.1391558955552; Tue, 04 Feb 2014 16:09:15 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.109.101 with SMTP id k92ls262703qgf.78.gmail; Tue, 04 Feb 2014 16:09:15 -0800 (PST) X-Received: by 10.220.191.134 with SMTP id dm6mr35476076vcb.16.1391558955459; Tue, 04 Feb 2014 16:09:15 -0800 (PST) Received: from mail-ve0-f182.google.com (mail-ve0-f182.google.com [209.85.128.182]) by mx.google.com with ESMTPS id eo4si8980069vdb.4.2014.02.04.16.09.15 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 04 Feb 2014 16:09:15 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.182 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.182; Received: by mail-ve0-f182.google.com with SMTP id jy13so6707362veb.13 for ; Tue, 04 Feb 2014 16:09:15 -0800 (PST) X-Received: by 10.52.89.230 with SMTP id br6mr29859529vdb.20.1391558955381; Tue, 04 Feb 2014 16:09:15 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp4076vcz; Tue, 4 Feb 2014 16:09:14 -0800 (PST) X-Received: by 10.68.135.137 with SMTP id ps9mr13007223pbb.160.1391558954332; Tue, 04 Feb 2014 16:09:14 -0800 (PST) Received: from mail-pd0-f171.google.com (mail-pd0-f171.google.com [209.85.192.171]) by mx.google.com with ESMTPS id eb3si26592888pbd.197.2014.02.04.16.09.13 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 04 Feb 2014 16:09:14 -0800 (PST) Received-SPF: neutral (google.com: 209.85.192.171 is neither permitted nor denied by best guess record for domain of john.stultz@linaro.org) client-ip=209.85.192.171; Received: by mail-pd0-f171.google.com with SMTP id g10so8896586pdj.30 for ; Tue, 04 Feb 2014 16:09:13 -0800 (PST) X-Received: by 10.66.144.102 with SMTP id sl6mr46586649pab.96.1391558953796; Tue, 04 Feb 2014 16:09:13 -0800 (PST) Received: from localhost.localdomain (c-67-170-153-23.hsd1.or.comcast.net. [67.170.153.23]) by mx.google.com with ESMTPSA id g6sm181483447pat.2.2014.02.04.16.09.12 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 04 Feb 2014 16:09:12 -0800 (PST) From: John Stultz To: LKML Cc: Greg Hackmann , Greg KH , Colin Cross , Android Kernel Team , John Stultz Subject: [PATCH 1/7] staging: sw_sync: Add stubs for kernels without CONFIG_SW_SYNC Date: Tue, 4 Feb 2014 16:08:34 -0800 Message-Id: <1391558920-31590-2-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1391558920-31590-1-git-send-email-john.stultz@linaro.org> References: <1391558920-31590-1-git-send-email-john.stultz@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: john.stultz@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.182 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Greg Hackmann Add stubs for kernels without CONFIG_SW_SYNC Cc: Greg KH Cc: Colin Cross Cc: Android Kernel Team Signed-off-by: Greg Hackmann [jstultz: resolved minor conflict, tweaked commit message] Signed-off-by: John Stultz --- drivers/staging/android/sw_sync.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/drivers/staging/android/sw_sync.h b/drivers/staging/android/sw_sync.h index 585040b..5aaf71d 100644 --- a/drivers/staging/android/sw_sync.h +++ b/drivers/staging/android/sw_sync.h @@ -35,10 +35,27 @@ struct sw_sync_pt { u32 value; }; +#if IS_ENABLED(CONFIG_SW_SYNC) struct sw_sync_timeline *sw_sync_timeline_create(const char *name); void sw_sync_timeline_inc(struct sw_sync_timeline *obj, u32 inc); struct sync_pt *sw_sync_pt_create(struct sw_sync_timeline *obj, u32 value); +#else +static inline struct sw_sync_timeline *sw_sync_timeline_create(const char *name) +{ + return NULL; +} + +static inline void sw_sync_timeline_inc(struct sw_sync_timeline *obj, u32 inc) +{ +} + +static inline struct sync_pt *sw_sync_pt_create(struct sw_sync_timeline *obj, + u32 value) +{ + return NULL; +} +#endif /* IS_ENABLED(CONFIG_SW_SYNC) */ #endif /* __KERNEL __ */