From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753862AbXDNVWY (ORCPT ); Sat, 14 Apr 2007 17:22:24 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753846AbXDNVWA (ORCPT ); Sat, 14 Apr 2007 17:22:00 -0400 Received: from gw.goop.org ([64.81.55.164]:59557 "EHLO mail.goop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753862AbXDNVUQ (ORCPT ); Sat, 14 Apr 2007 17:20:16 -0400 Message-Id: <20070414204924.227634121@goop.org> References: <20070414204154.871250608@goop.org> User-Agent: quilt/0.46-1 Date: Sat, 14 Apr 2007 13:42:05 -0700 From: Jeremy Fitzhardinge To: Andi Kleen Cc: Andrew Morton , virtualization@lists.osdl.org, lkml Subject: [PATCH 11/28] x86: incremental update for i386 and x86-64 check_bugs Content-Disposition: inline; filename=cleanup-cleanup-asm-bugs_h.patch Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org i386 bugs.c shouldn't refer to identify_boot_cpu yet, since it doesn't get introduced until the identify_cpu patch. Remove spurious comments, headers and keywords from x86-64 bugs.[ch]. Signed-off-by: Jeremy Fitzhardinge --- arch/i386/kernel/cpu/bugs.c | 2 +- arch/x86_64/kernel/bugs.c | 9 +-------- include/asm-i386/bugs.h | 2 +- 3 files changed, 3 insertions(+), 10 deletions(-) =================================================================== --- a/arch/i386/kernel/cpu/bugs.c +++ b/arch/i386/kernel/cpu/bugs.c @@ -177,7 +177,7 @@ static void __init check_config(void) void __init check_bugs(void) { - identify_boot_cpu(); + identify_cpu(&boot_cpu_data); #ifndef CONFIG_SMP printk("CPU: "); print_cpu_info(&boot_cpu_data); =================================================================== --- a/arch/x86_64/kernel/bugs.c +++ b/arch/x86_64/kernel/bugs.c @@ -3,19 +3,12 @@ * * Copyright (C) 1994 Linus Torvalds * Copyright (C) 2000 SuSE - * - * This is included by init/main.c to check for architecture-dependent bugs. - * - * Needs: - * void check_bugs(void); */ #include +#include #include #include -#include -#include -#include void __init check_bugs(void) { =================================================================== --- a/include/asm-i386/bugs.h +++ b/include/asm-i386/bugs.h @@ -7,6 +7,6 @@ #ifndef _ASM_I386_BUG_H #define _ASM_I386_BUG_H -extern void __init check_bugs(void); +void check_bugs(void); #endif /* _ASM_I386_BUG_H */ --