From fd0466e6ad913f48a377317067c3496b44ae8c90 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 23 Apr 2013 18:30:48 +0200
Subject: [PATCH] --- yaml --- r: 364168 b: refs/heads/master c:
 796ce5a7e4ef88ee0bfbeaa80070a51570650d57 h: refs/heads/master v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/staging/zsmalloc/zsmalloc-main.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1e1d5697cad0..b6644397d961 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2516ffac94e389cfeeb3abf2fd59d7c688a38f0c
+refs/heads/master: 796ce5a7e4ef88ee0bfbeaa80070a51570650d57
diff --git a/trunk/drivers/staging/zsmalloc/zsmalloc-main.c b/trunk/drivers/staging/zsmalloc/zsmalloc-main.c
index 324e123335d6..f82f7e69c8a5 100644
--- a/trunk/drivers/staging/zsmalloc/zsmalloc-main.c
+++ b/trunk/drivers/staging/zsmalloc/zsmalloc-main.c
@@ -225,7 +225,7 @@ struct zs_pool {
  * so that USE_PGTABLE_MAPPING is defined. This causes zsmalloc to use
  * page table mapping rather than copying for object mapping.
 */
-#if defined(CONFIG_ARM)
+#if defined(CONFIG_ARM) && !defined(MODULE)
 #define USE_PGTABLE_MAPPING
 #endif