From patchwork Fri Mar 4 14:24:23 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 327 Return-Path: Delivered-To: unknown Received: from imap.gmail.com (74.125.159.109) by localhost6.localdomain6 with IMAP4-SSL; 08 Jun 2011 14:41:43 -0000 Delivered-To: patches@linaro.org Received: by 10.224.60.68 with SMTP id o4cs16561qah; Fri, 4 Mar 2011 06:24:34 -0800 (PST) Received: by 10.216.22.79 with SMTP id s57mr612165wes.94.1299248674018; Fri, 04 Mar 2011 06:24:34 -0800 (PST) Received: from eu1sys200aog115.obsmtp.com (eu1sys200aog115.obsmtp.com [207.126.144.139]) by mx.google.com with SMTP id p81si2823851wej.22.2011.03.04.06.24.29 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 04 Mar 2011 06:24:33 -0800 (PST) Received-SPF: neutral (google.com: 207.126.144.139 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) client-ip=207.126.144.139; Authentication-Results: mx.google.com; spf=neutral (google.com: 207.126.144.139 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) smtp.mail=linus.walleij@stericsson.com Received: from source ([164.129.1.35]) (using TLSv1) by eu1sys200aob115.postini.com ([207.126.147.11]) with SMTP ID DSNKTXD2HfOqL1aek55zUpipxidsz9ga8tMU@postini.com; Fri, 04 Mar 2011 14:24:32 UTC Received: from zeta.dmz-eu.st.com (ns2.st.com [164.129.230.9]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id E5D23C5; Fri, 4 Mar 2011 14:24:28 +0000 (GMT) Received: from relay1.stm.gmessaging.net (unknown [10.230.100.17]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 9AA4E2904; Fri, 4 Mar 2011 14:24:28 +0000 (GMT) Received: from exdcvycastm022.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm022", Issuer "exdcvycastm022" (not verified)) by relay1.stm.gmessaging.net (Postfix) with ESMTPS id 400C524C2AB; Fri, 4 Mar 2011 15:24:21 +0100 (CET) Received: from localhost.localdomain (10.230.100.153) by smtp.stericsson.com (10.230.100.30) with Microsoft SMTP Server (TLS) id 8.2.254.0; Fri, 4 Mar 2011 15:24:28 +0100 From: Linus Walleij To: Cc: Lee Jones , Linus Walleij Subject: [PATCH] ARM: fix compile error in tlb.h Date: Fri, 4 Mar 2011 15:24:23 +0100 Message-ID: <1299248663-27130-1-git-send-email-linus.walleij@stericsson.com> X-Mailer: git-send-email 1.7.3.2 MIME-Version: 1.0 From: Linus Walleij It seems some of the new tlb handling code merged for 2.6.38-rc7 use while this is only included for the NON-MMU case. This moves the inclusion out of the clause so the kernel compiles. Signed-off-by: Linus Walleij --- Symptom without this patch: n file included from /home/elinwal/linux-2.6/arch/arm/mm/init.c:27: /home/elinwal/linux-2.6/arch/arm/include/asm/tlb.h: In function 'tlb_flush_mmu': /home/elinwal/linux-2.6/arch/arm/include/asm/tlb.h:104: error: implicit declaration of function 'release_pages' /home/elinwal/linux-2.6/arch/arm/include/asm/tlb.h: In function 'tlb_remove_page': /home/elinwal/linux-2.6/arch/arm/include/asm/tlb.h:168: error: implicit declaration of function 'page_cache_release' make[3]: *** [arch/arm/mm/init.o] Error 1 --- arch/arm/include/asm/tlb.h | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/arch/arm/include/asm/tlb.h b/arch/arm/include/asm/tlb.h index 82dfe5d..d13af30 100644 --- a/arch/arm/include/asm/tlb.h +++ b/arch/arm/include/asm/tlb.h @@ -21,14 +21,13 @@ #ifndef CONFIG_MMU -#include - #define tlb_flush(tlb) ((void) tlb) #include #else /* !CONFIG_MMU */ +#include #include #include #include