From patchwork Mon May 14 21:28:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Miller X-Patchwork-Id: 159198 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 0BCFDB703C for ; Tue, 15 May 2012 07:28:43 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758068Ab2ENV2m (ORCPT ); Mon, 14 May 2012 17:28:42 -0400 Received: from shards.monkeyblade.net ([198.137.202.13]:59576 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758055Ab2ENV2l (ORCPT ); Mon, 14 May 2012 17:28:41 -0400 Received: from localhost (cpe-66-108-118-54.nyc.res.rr.com [66.108.118.54]) (authenticated bits=0) by shards.monkeyblade.net (8.14.4/8.14.4) with ESMTP id q4ELScwE004391 (version=TLSv1/SSLv3 cipher=RC4-SHA bits=128 verify=NO); Mon, 14 May 2012 14:28:39 -0700 Date: Mon, 14 May 2012 17:28:38 -0400 (EDT) Message-Id: <20120514.172838.512742393144403575.davem@davemloft.net> To: sam@ravnborg.org Cc: sparclinux@vger.kernel.org Subject: Re: [PATCH] sparc32: Move cache and TLB flushes over to method ops. From: David Miller In-Reply-To: <20120514121612.GA17137@merkur.ravnborg.org> References: <20120514.021436.644561777451770710.davem@davemloft.net> <20120514104450.GA8454@merkur.ravnborg.org> <20120514121612.GA17137@merkur.ravnborg.org> X-Mailer: Mew version 6.5 on Emacs 24.0.95 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.6 (shards.monkeyblade.net [198.137.202.13]); Mon, 14 May 2012 14:28:39 -0700 (PDT) Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org From: Sam Ravnborg Date: Mon, 14 May 2012 14:16:12 +0200 > There is a bunch of inlines in smp_32.h you miss > to kill: > > hard_smp4m_processor_id, > hard_smp4d_processor_id, > hard_smpleon_processor_id Taken care of, as follows: -------------------- [PATCH] sparc32: Kill unused hard_smp{4m,4d,leon}_processor_id() inlined. Reported-by: Sam Ravnborg Signed-off-by: David S. Miller --- arch/sparc/include/asm/smp_32.h | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/arch/sparc/include/asm/smp_32.h b/arch/sparc/include/asm/smp_32.h index b9cf697..b73da3c 100644 --- a/arch/sparc/include/asm/smp_32.h +++ b/arch/sparc/include/asm/smp_32.h @@ -103,35 +103,6 @@ static inline int cpu_logical_map(int cpu) return cpu; } -static inline int hard_smp4m_processor_id(void) -{ - int cpuid; - - __asm__ __volatile__("rd %%tbr, %0\n\t" - "srl %0, 12, %0\n\t" - "and %0, 3, %0\n\t" : - "=&r" (cpuid)); - return cpuid; -} - -static inline int hard_smp4d_processor_id(void) -{ - int cpuid; - - __asm__ __volatile__("lda [%%g0] %1, %0\n\t" : - "=&r" (cpuid) : "i" (ASI_M_VIKING_TMP1)); - return cpuid; -} - -extern inline int hard_smpleon_processor_id(void) -{ - int cpuid; - __asm__ __volatile__("rd %%asr17,%0\n\t" - "srl %0,28,%0" : - "=&r" (cpuid) : ); - return cpuid; -} - extern int hard_smp_processor_id(void); #define raw_smp_processor_id() (current_thread_info()->cpu)