From patchwork Tue Jun 9 11:22:10 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Eisele X-Patchwork-Id: 28302 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id D98B5B70C6 for ; Tue, 9 Jun 2009 21:19:41 +1000 (EST) Received: by ozlabs.org (Postfix) id CAEB1DDD0B; Tue, 9 Jun 2009 21:19:41 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 6CE33DDD01 for ; Tue, 9 Jun 2009 21:19:41 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754669AbZFILTO (ORCPT ); Tue, 9 Jun 2009 07:19:14 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754776AbZFILTO (ORCPT ); Tue, 9 Jun 2009 07:19:14 -0400 Received: from mail176c2.megamailservers.com ([69.49.111.76]:47811 "EHLO mail176c2.megamailservers.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754669AbZFILTN (ORCPT ); Tue, 9 Jun 2009 07:19:13 -0400 X-Authenticated-User: konrad.gaisler.com Received: from [192.168.0.29] (c-10a5e155.260-1-64736c10.cust.bredbandsbolaget.se [85.225.165.16]) (authenticated bits=0) by mail176c2.megamailservers.com (8.13.6/8.13.1) with ESMTP id n59BJDH4030039 for ; Tue, 9 Jun 2009 07:19:14 -0400 Message-ID: <4A2E45E2.4070906@gaisler.com> Date: Tue, 09 Jun 2009 13:22:10 +0200 From: Konrad Eisele User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.17) Gecko/20080829 SeaMonkey/1.1.12 MIME-Version: 1.0 To: sparclinux@vger.kernel.org Subject: [PATCH 4/7] Undefine srmmu_hwprobe in the CONFIG_LEON case. References: <4A2E36A6.4050008@gaisler.com> In-Reply-To: <4A2E36A6.4050008@gaisler.com> Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org From 93d982ed55ae6f81a06329524fbfdf0fec4d9d1e Mon Sep 17 00:00:00 2001 From: Konrad Eisele Date: Tue, 9 Jun 2009 12:59:42 +0200 Subject: [PATCH 4/7] Undefine srmmu_hwprobe in the CONFIG_LEON case. The sparc-leon SRMMU has no mmu probe logic implemented. Instead function srmmu_swprobe() is used that is defined in arch/sparc/mm/leon.c. arch/sparc/include/asm/leon.h on the other hand defines srmmu_hwprobe(addr) as a macro Signed-off-by: Konrad Eisele --- arch/sparc/include/asm/pgtsrmmu.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/arch/sparc/include/asm/pgtsrmmu.h b/arch/sparc/include/asm/pgtsrmmu.h index 808555f..1701181 100644 --- a/arch/sparc/include/asm/pgtsrmmu.h +++ b/arch/sparc/include/asm/pgtsrmmu.h @@ -267,6 +267,7 @@ static inline void srmmu_flush_tlb_page( } +#if !(defined(CONFIG_LEON)) static inline unsigned long srmmu_hwprobe(unsigned long vaddr) { unsigned long retval; @@ -278,6 +279,7 @@ static inline unsigned long srmmu_hwprob return retval; } +#endif static inline int srmmu_get_pte (unsigned long addr)