[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20110126172605.GG8446@linux.vnet.ibm.com>
Date: Wed, 26 Jan 2011 11:26:05 -0600
From: Robert Jennings <rcj@...ux.vnet.ibm.com>
To: Nitin Gupta <ngupta@...are.org>
Cc: Greg Kroah-Hartman <gregkh@...e.de>,
Robert Jennings <rcj@...ux.vnet.ibm.com>,
Pekka Enberg <penberg@...helsinki.fi>,
devel@...verdev.osuosl.org, linux-kernel@...r.kernel.org
Subject: [PATCH 5/7] zram/xvmalloc: wrap debug code in #ifdef DEBUG
This wraps the code, noted by comments as being debug code, with
#ifdef DEBUG so that it is removed from running in non-debug kernels.
Signed-off-by: Robert Jennings <rcj@...ux.vnet.ibm.com>
---
drivers/staging/zram/xvmalloc.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/drivers/staging/zram/xvmalloc.c b/drivers/staging/zram/xvmalloc.c
index b3622f1..172514e 100644
--- a/drivers/staging/zram/xvmalloc.c
+++ b/drivers/staging/zram/xvmalloc.c
@@ -219,7 +219,6 @@ static void insert_block(struct xv_pool *pool, struct page *page, u32 offset,
static void remove_block_head(struct xv_pool *pool,
struct block_header *block, u32 slindex)
{
- struct block_header *tmpblock;
u32 flindex = slindex / BITS_PER_LONG;
pool->freelist[slindex].page = block->link.next_page;
@@ -232,6 +231,8 @@ static void remove_block_head(struct xv_pool *pool,
if (!pool->slbitmap[flindex])
__clear_bit(flindex, &pool->flbitmap);
} else {
+#ifdef DEBUG
+ struct block_header *tmpblock;
/*
* DEBUG ONLY: We need not reinitialize freelist head previous
* pointer to 0 - we never depend on its value. But just for
@@ -242,6 +243,7 @@ static void remove_block_head(struct xv_pool *pool,
tmpblock->link.prev_page = 0;
tmpblock->link.prev_offset = 0;
put_ptr_atomic(tmpblock, KM_USER1);
+#endif
}
}
--
1.6.0.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists