From patchwork Wed May 25 17:02:41 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Perches X-Patchwork-Id: 816822 Received: from bombadil.infradead.org (bombadil.infradead.org [18.85.46.34]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p4PH4jvn029074 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 25 May 2011 17:05:06 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by bombadil.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QPHU4-0001ff-U0; Wed, 25 May 2011 17:03:01 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QPHU3-0004f5-BD; Wed, 25 May 2011 17:02:59 +0000 Received: from mail.perches.com ([173.55.12.10]) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QPHTq-0004eI-Tv for linux-arm-kernel@lists.infradead.org; Wed, 25 May 2011 17:02:48 +0000 Received: from atheros-desktop.home (unknown [192.168.1.161]) by mail.perches.com (Postfix) with ESMTP id 71D192436F; Wed, 25 May 2011 10:02:35 -0700 (PDT) From: Joe Perches To: Geert Uytterhoeven , Xiantao Zhang , Avi Kivity , Marcelo Tosatti Subject: [PATCH 4/4] treewide: Remove asmlinkage from printk Date: Wed, 25 May 2011 10:02:41 -0700 Message-Id: <2053d1648f4f33f99ed8e096346e2133b2328951.1306342673.git.joe@perches.com> X-Mailer: git-send-email 1.7.4.rc3 In-Reply-To: References: In-Reply-To: References: X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110525_130247_262948_17C3B4D4 X-CRM114-Status: GOOD ( 13.57 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain Cc: Randy Dunlap , Fenghua Yu , Tony Luck , Russell King , kvm@vger.kernel.org, kvm-ia64@vger.kernel.org, x86@kernel.org, linux-kernel@vger.kernel.org, Ingo Molnar , "H. Peter Anvin" , linux-ia64@vger.kernel.org, Andrew Morton , Thomas Gleixner , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Wed, 25 May 2011 17:05:06 +0000 (UTC) Remove the now unnecessary asmlinkage attribute from the various printk prototypes and uses. Signed-off-by: Joe Perches --- arch/arm/kernel/early_printk.c | 2 +- arch/ia64/kvm/vmm.c | 2 +- arch/x86/kernel/early_printk.c | 2 +- include/linux/printk.h | 6 +++--- kernel/printk.c | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/arm/kernel/early_printk.c b/arch/arm/kernel/early_printk.c index 85aa2b2..46798d5 100644 --- a/arch/arm/kernel/early_printk.c +++ b/arch/arm/kernel/early_printk.c @@ -36,7 +36,7 @@ static struct console early_console = { .index = -1, }; -asmlinkage void early_printk(const char *fmt, ...) +void early_printk(const char *fmt, ...) { char buf[512]; int n; diff --git a/arch/ia64/kvm/vmm.c b/arch/ia64/kvm/vmm.c index f0b9cac..40331ac 100644 --- a/arch/ia64/kvm/vmm.c +++ b/arch/ia64/kvm/vmm.c @@ -81,7 +81,7 @@ static void vcpu_debug_exit(struct kvm_vcpu *vcpu) local_irq_restore(psr); } -asmlinkage int printk(const char *fmt, ...) +int printk(const char *fmt, ...) { struct kvm_vcpu *vcpu = current_vcpu; va_list args; diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c index cd28a35..b9b323a 100644 --- a/arch/x86/kernel/early_printk.c +++ b/arch/x86/kernel/early_printk.c @@ -173,7 +173,7 @@ static struct console early_serial_console = { static struct console *early_console = &early_vga_console; static int __initdata early_console_initialized; -asmlinkage void early_printk(const char *fmt, ...) +void early_printk(const char *fmt, ...) { char buf[512]; int n; diff --git a/include/linux/printk.h b/include/linux/printk.h index 3736545..e52bc4b 100644 --- a/include/linux/printk.h +++ b/include/linux/printk.h @@ -90,16 +90,16 @@ int no_printk(const char *fmt, ...) return 0; } -extern asmlinkage __attribute__ ((format (printf, 1, 2))) +extern __attribute__ ((format (printf, 1, 2))) void early_printk(const char *fmt, ...); extern int printk_needs_cpu(int cpu); extern void printk_tick(void); #ifdef CONFIG_PRINTK -asmlinkage __attribute__ ((format (printf, 1, 0))) +__attribute__ ((format (printf, 1, 0))) int vprintk(const char *fmt, va_list args); -asmlinkage __attribute__ ((format (printf, 1, 2))) __cold +__attribute__ ((format (printf, 1, 2))) __cold int printk(const char *fmt, ...); /* diff --git a/kernel/printk.c b/kernel/printk.c index da8ca81..735056c 100644 --- a/kernel/printk.c +++ b/kernel/printk.c @@ -46,7 +46,7 @@ /* * Architectures can override it: */ -void asmlinkage __attribute__((weak)) early_printk(const char *fmt, ...) +void __attribute__((weak)) early_printk(const char *fmt, ...) { } @@ -704,7 +704,7 @@ static int have_callable_console(void) * See the vsnprintf() documentation for format string extensions over C99. */ -asmlinkage int printk(const char *fmt, ...) +int printk(const char *fmt, ...) { va_list args; int r; @@ -794,7 +794,7 @@ static inline void printk_delay(void) } } -asmlinkage int vprintk(const char *fmt, va_list args) +int vprintk(const char *fmt, va_list args) { int printed_len = 0; int current_log_level = default_message_loglevel;