Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755278AbZGVOBY (ORCPT ); Wed, 22 Jul 2009 10:01:24 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754733AbZGVOBX (ORCPT ); Wed, 22 Jul 2009 10:01:23 -0400 Received: from mail.free-electrons.com ([88.191.76.200]:42580 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753957AbZGVOBX (ORCPT ); Wed, 22 Jul 2009 10:01:23 -0400 From: Albin Tonnerre To: linux@arm.linux.org.uk, hpa@zytor.com Cc: alain@knaff.lu, linux-kernel@vger.kernel.org, linux-embedded@vger.kernel.org, Albin Tonnerre Subject: [PATCH 1/5] lib/decompress_*: only include if STATIC is not defined Date: Wed, 22 Jul 2009 16:01:15 +0200 Message-Id: <1248271279-9920-1-git-send-email-albin.tonnerre@free-electrons.com> X-Mailer: git-send-email 1.6.0.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1974 Lines: 70 These includes were added by 079effb6933f34b9b1b67b08bd4fd7fb672d16ef to fix the build when using kmemtrace. However this is not necessary when used to create a compressed kernel, and actually creates issues (brings a lot of things unavailable in the decompression environment), so don't include it if STATIC is defined. Signed-off-by: Albin Tonnerre --- lib/decompress_bunzip2.c | 2 +- lib/decompress_inflate.c | 2 +- lib/decompress_unlzma.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/decompress_bunzip2.c b/lib/decompress_bunzip2.c index 708e2a8..14b0c7d 100644 --- a/lib/decompress_bunzip2.c +++ b/lib/decompress_bunzip2.c @@ -47,10 +47,10 @@ #ifndef STATIC #include +#include #endif /* !STATIC */ #include -#include #ifndef INT_MAX #define INT_MAX 0x7fffffff diff --git a/lib/decompress_inflate.c b/lib/decompress_inflate.c index e36b296..fc30d50 100644 --- a/lib/decompress_inflate.c +++ b/lib/decompress_inflate.c @@ -19,11 +19,11 @@ #include "zlib_inflate/inflate.h" #include "zlib_inflate/infutil.h" +#include #endif /* STATIC */ #include -#include #define INBUF_LEN (16*1024) diff --git a/lib/decompress_unlzma.c b/lib/decompress_unlzma.c index 32123a1..f078c88 100644 --- a/lib/decompress_unlzma.c +++ b/lib/decompress_unlzma.c @@ -31,10 +31,10 @@ #ifndef STATIC #include +#include #endif /* STATIC */ #include -#include #define MIN(a, b) (((a) < (b)) ? (a) : (b)) -- 1.6.0.4 -- 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/