From patchwork Tue Sep 7 19:45:11 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 64057 X-Patchwork-Delegate: leann.ogasawara@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id D3933B6EF7 for ; Wed, 8 Sep 2010 05:45:56 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1Ot46y-0003Sw-74; Tue, 07 Sep 2010 20:45:44 +0100 Received: from smtp2f.orange.fr ([80.12.242.151]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1Ot46v-0003SD-T6 for kernel-team@lists.ubuntu.com; Tue, 07 Sep 2010 20:45:41 +0100 Received: from me-wanadoo.net (localhost [127.0.0.1]) by mwinf2f07.orange.fr (SMTP Server) with ESMTP id 43C928002EDD; Tue, 7 Sep 2010 21:45:13 +0200 (CEST) Received: from me-wanadoo.net (localhost [127.0.0.1]) by mwinf2f07.orange.fr (SMTP Server) with ESMTP id 36A5E8002E12; Tue, 7 Sep 2010 21:45:13 +0200 (CEST) Received: from localhost.localdomain (AToulouse-159-1-102-233.w92-134.abo.wanadoo.fr [92.134.109.233]) by mwinf2f07.orange.fr (SMTP Server) with ESMTP id D1AED8002EDD; Tue, 7 Sep 2010 21:45:12 +0200 (CEST) X-ME-UUID: 20100907194512858.D1AED8002EDD@mwinf2f07.orange.fr From: Daniel Lezcano To: Leann Ogasawara Subject: [PATCH] Ubuntu: SAUCE: fix compilation warning when CONFIG_SECURITY is not set Date: Tue, 7 Sep 2010 21:45:11 +0200 Message-Id: <1283888711-12840-1-git-send-email-daniel.lezcano@free.fr> X-Mailer: git-send-email 1.7.0.4 MIME-Version: 1.0 Cc: kernel-team@lists.ubuntu.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com Function prototype differs when CONFIG_SECURITY is not set leading to a warning: include/linux/security.h: In function ‘security_task_free’: include/linux/security.h:2244: warning: no return statement in function returning non-void The patch that introduced this warning was Maverick commit: 2aec770a575b15cb1e43c2e16dff4f00a02a8c9a. Acked-by: Tim Gardner Signed-off-by: Daniel Lezcano --- include/linux/security.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/linux/security.h b/include/linux/security.h index d7d65e0..a380eed 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -2240,7 +2240,7 @@ static inline int security_task_create(unsigned long clone_flags) return 0; } -static inline int security_task_free(struct task_struct *task) +static inline void security_task_free(struct task_struct *task) { } static inline int security_cred_alloc_blank(struct cred *cred, gfp_t gfp)