Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751060AbWEPNPQ (ORCPT ); Tue, 16 May 2006 09:15:16 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751823AbWEPNPQ (ORCPT ); Tue, 16 May 2006 09:15:16 -0400 Received: from mail21.syd.optusnet.com.au ([211.29.133.158]:33983 "EHLO mail21.syd.optusnet.com.au") by vger.kernel.org with ESMTP id S1751060AbWEPNPO convert rfc822-to-8bit (ORCPT ); Tue, 16 May 2006 09:15:14 -0400 From: Con Kolivas To: linux-kernel@vger.kernel.org, "Pekka Enberg" Subject: [PATCH] mm: cleanup swap unused warning Date: Tue, 16 May 2006 23:14:35 +1000 User-Agent: KMail/1.9.1 Cc: Christoph Lameter , linux-mm@kvack.org, Andrew Morton References: <200605102132.41217.kernel@kolivas.org> <200605162055.36957.kernel@kolivas.org> In-Reply-To: <200605162055.36957.kernel@kolivas.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8BIT Content-Disposition: inline Message-Id: <200605162314.36059.kernel@kolivas.org> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1739 Lines: 49 On Tuesday 16 May 2006 20:55, Con Kolivas wrote: > Ok so if we fix it by making swp_entry_t __attribute__((__unused__) we > break swap migration code? > > If we make swap_free() an empty static inline function then gcc compiles in > the variable needlessly and we won't know it. Rather than assume I checked the generated code and I was wrong (which is something I'm getting good at being). The variable is not compiled in so the empty static inline as suggested by Pekka suffices to silence this warning. --- if CONFIG_SWAP is not defined we get: mm/vmscan.c: In function ‘remove_mapping’: mm/vmscan.c:387: warning: unused variable ‘swap’ Signed-off-by: Con Kolivas --- include/linux/swap.h | 5 ++++- 1 files changed, 4 insertions(+), 1 deletion(-) Index: linux-2.6.17-rc4/include/linux/swap.h =================================================================== --- linux-2.6.17-rc4.orig/include/linux/swap.h 2006-05-16 23:07:35.000000000 +1000 +++ linux-2.6.17-rc4/include/linux/swap.h 2006-05-16 23:08:08.000000000 +1000 @@ -292,7 +292,10 @@ static inline void disable_swap_token(vo #define show_swap_cache_info() /*NOTHING*/ #define free_swap_and_cache(swp) /*NOTHING*/ #define swap_duplicate(swp) /*NOTHING*/ -#define swap_free(swp) /*NOTHING*/ +static inline void swap_free(swp_entry_t swp) +{ +} + #define read_swap_cache_async(swp,vma,addr) NULL #define lookup_swap_cache(swp) NULL #define valid_swaphandles(swp, off) 0 -- -ck - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/