From patchwork Mon Oct 25 15:52:38 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Namhyung Kim X-Patchwork-Id: 69113 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 6BCE6B70B8 for ; Tue, 26 Oct 2010 02:53:33 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756631Ab0JYPw5 (ORCPT ); Mon, 25 Oct 2010 11:52:57 -0400 Received: from mail-gw0-f46.google.com ([74.125.83.46]:38672 "EHLO mail-gw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756278Ab0JYPwz (ORCPT ); Mon, 25 Oct 2010 11:52:55 -0400 Received: by gwj21 with SMTP id 21so2566495gwj.19 for ; Mon, 25 Oct 2010 08:52:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=vIOfq+oK0fCG8ehpURScJUaG0AJwwB8fQu9nKw1tFP4=; b=pqlDFq1EyqNgxUZtkX0kB3U0/GW1PWUMes+8ordY4zp1xX3n5j6xL+BqHnYG0sDgO3 x7BfR9wqDqF0bWMTeVfEqHYj8OpSBkIT6SUZaSBEqKJyw1swu4z4lRoZV8bhElthB1tD /AxOTpgzoI52hTR3Ezl/F+6dd4o1qn6EI57aY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=VpxGGDuZHAg2yxQEKIkC2rzfwexxfcbxHYRSEmhtHaIap4Zneo3RQDLOvu7UImTjvd bhM3n9SQOpJfCJoCZuWstauMzZ0Ej5PZEDPd67uJtrpBSYpN7osthcyqginHAPdj1o8A 5tub4pyZfEBrtCAdYWuyA/MnERz3mQzB1TnAs= Received: by 10.42.119.147 with SMTP id b19mr5175375icr.259.1288021974700; Mon, 25 Oct 2010 08:52:54 -0700 (PDT) Received: from localhost.localdomain ([211.201.183.198]) by mx.google.com with ESMTPS id 8sm8214151iba.10.2010.10.25.08.52.52 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 25 Oct 2010 08:52:54 -0700 (PDT) From: Namhyung Kim To: "David S. Miller" Cc: sparclinux@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] sparc32: fix build failure on CONFIG_SPARC_LEON Date: Tue, 26 Oct 2010 00:52:38 +0900 Message-Id: <1288021958-3130-3-git-send-email-namhyung@gmail.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1288021958-3130-1-git-send-email-namhyung@gmail.com> References: <1288021958-3130-1-git-send-email-namhyung@gmail.com> Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org CC arch/sparc/kernel/irq_32.o arch/sparc/kernel/irq_32.c: In function 'request_fast_irq': arch/sparc/kernel/irq_32.c:370:25: error: conflicting types for 'trapbase_cpu1' arch/sparc/include/asm/leon.h:366:22: note: previous declaration of 'trapbase_cpu1' was here arch/sparc/kernel/irq_32.c:370:40: error: conflicting types for 'trapbase_cpu2' arch/sparc/include/asm/leon.h:367:22: note: previous declaration of 'trapbase_cpu2' was here arch/sparc/kernel/irq_32.c:370:55: error: conflicting types for 'trapbase_cpu3' arch/sparc/include/asm/leon.h:368:22: note: previous declaration of 'trapbase_cpu3' was here make[3]: *** [arch/sparc/kernel/irq_32.o] Error 1 make[2]: *** [arch/sparc/kernel] Error 2 make[1]: *** [sub-make] Error 2 make: *** [all] Error 2 Signed-off-by: Namhyung Kim --- arch/sparc/kernel/irq_32.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/sparc/kernel/irq_32.c b/arch/sparc/kernel/irq_32.c index 0116d8d..5ad6e5c 100644 --- a/arch/sparc/kernel/irq_32.c +++ b/arch/sparc/kernel/irq_32.c @@ -365,7 +365,7 @@ static int request_fast_irq(unsigned int irq, unsigned long flags; unsigned int cpu_irq; int ret; -#ifdef CONFIG_SMP +#if defined CONFIG_SMP && !defined CONFIG_SPARC_LEON struct tt_entry *trap_table; extern struct tt_entry trapbase_cpu1, trapbase_cpu2, trapbase_cpu3; #endif @@ -425,7 +425,7 @@ static int request_fast_irq(unsigned int irq, table[SP_TRAP_IRQ1+(cpu_irq-1)].inst_four = SPARC_NOP; INSTANTIATE(sparc_ttable) -#ifdef CONFIG_SMP +#if defined CONFIG_SMP && !defined CONFIG_SPARC_LEON trap_table = &trapbase_cpu1; INSTANTIATE(trap_table) trap_table = &trapbase_cpu2; INSTANTIATE(trap_table) trap_table = &trapbase_cpu3; INSTANTIATE(trap_table)