From: Miklos Vajna <vmiklos@frugalware.org>
To: Ingo Molnar <mingo@elte.hu>
Cc: linux-kernel@vger.kernel.org,
Thomas Gleixner <tglx@linutronix.de>,
"H. Peter Anvin" <hpa@zytor.com>
Subject: [PATCH] x86: janitor work in bugs.c
Date: Sat, 17 May 2008 22:48:13 +0200 [thread overview]
Message-ID: <1211057293-19497-1-git-send-email-vmiklos@frugalware.org> (raw)
In-Reply-To: <20080516134858.GC28910@elte.hu>
Just moved trailing statements to the next line, removed space before
open/close parenthesis, wrapped long lines.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
---
On Fri, May 16, 2008 at 03:48:58PM +0200, Ingo Molnar <mingo@elte.hu> wrote:
> the two comments should be merged, somehow like this:
Merged.
> or just do:
>
> > + init_utsname()->machine[1] =
> > + '0' + (boot_cpu_data.x86 > 6 ? 6 : boot_cpu_data.x86);
OK, I did so.
arch/x86/kernel/cpu/bugs.c | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index 170d2f5..12c27c8 100644
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -59,8 +59,12 @@ static void __init check_fpu(void)
return;
}
-/* trap_init() enabled FXSR and company _before_ testing for FP problems here. */
- /* Test for the divl bug.. */
+ /*
+ * trap_init() enabled FXSR and company _before_ testing for FP
+ * problems here.
+ *
+ * Test for the divl bug..
+ */
__asm__("fninit\n\t"
"fldl %1\n\t"
"fdivl %2\n\t"
@@ -108,10 +112,15 @@ static void __init check_popad(void)
"movl $12345678,%%eax; movl $0,%%edi; pusha; popa; movl (%%edx,%%edi),%%ecx "
: "=&a" (res)
: "d" (inp)
- : "ecx", "edi" );
- /* If this fails, it means that any user program may lock the CPU hard. Too bad. */
- if (res != 12345678) printk( "Buggy.\n" );
- else printk( "OK.\n" );
+ : "ecx", "edi");
+ /*
+ * If this fails, it means that any user program may lock the
+ * CPU hard. Too bad.
+ */
+ if (res != 12345678)
+ printk("Buggy.\n");
+ else
+ printk("OK.\n");
#endif
}
@@ -137,7 +146,8 @@ static void __init check_config(void)
* i486+ only features! (WP works in supervisor mode and the
* new "invlpg" and "bswap" instructions)
*/
-#if defined(CONFIG_X86_WP_WORKS_OK) || defined(CONFIG_X86_INVLPG) || defined(CONFIG_X86_BSWAP)
+#if defined(CONFIG_X86_WP_WORKS_OK) || defined(CONFIG_X86_INVLPG) || \
+ defined(CONFIG_X86_BSWAP)
if (boot_cpu_data.x86 == 3)
panic("Kernel requires i486+ for 'invlpg' and other features");
#endif
@@ -170,6 +180,7 @@ void __init check_bugs(void)
check_fpu();
check_hlt();
check_popad();
- init_utsname()->machine[1] = '0' + (boot_cpu_data.x86 > 6 ? 6 : boot_cpu_data.x86);
+ init_utsname()->machine[1] =
+ '0' + (boot_cpu_data.x86 > 6 ? 6 : boot_cpu_data.x86);
alternative_instructions();
}
--
1.5.4.3
next prev parent reply other threads:[~2008-05-17 20:48 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-13 11:35 [PATCH 1/3] x86: janitor work in video-vga.c Miklos Vajna
2008-05-13 11:35 ` [PATCH 2/3] x86: janitor work in bugs.c Miklos Vajna
2008-05-13 11:35 ` [PATCH 3/3] x86: janitor work in irq.c Miklos Vajna
2008-05-13 12:46 ` Ingo Molnar
2008-05-13 16:38 ` [PATCH] " Miklos Vajna
2008-05-16 17:28 ` Jesse Barnes
2008-05-13 12:44 ` [PATCH 2/3] x86: janitor work in bugs.c Ingo Molnar
2008-05-13 16:11 ` [PATCH] " Miklos Vajna
2008-05-16 13:48 ` Ingo Molnar
2008-05-17 20:48 ` Miklos Vajna [this message]
2008-05-13 21:09 ` [PATCH 2/3] " Andi Kleen
2008-05-13 21:44 ` Miklos Vajna
2008-05-14 0:21 ` Joe Perches
2008-05-14 4:44 ` H. Peter Anvin
2008-05-13 12:42 ` [PATCH 1/3] x86: janitor work in video-vga.c Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1211057293-19497-1-git-send-email-vmiklos@frugalware.org \
--to=vmiklos@frugalware.org \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®