* [PATCH 1/2] Clean up asm-x86_64/bugs.h
@ 2007-04-07 17:22 Jeremy Fitzhardinge
2007-04-09 15:45 ` Randy Dunlap
0 siblings, 1 reply; 4+ messages in thread
From: Jeremy Fitzhardinge @ 2007-04-07 17:22 UTC (permalink / raw)
To: Andrew Morton
Cc: Virtualization Mailing List, Linus Torvalds,
Linux Kernel Mailing List
Most of asm-x86_64/bugs.h is code which should be in a C file, so put it there.
Signed-off-by: Jeremy Fitzhardinge <jeremy@xensource.com>
Cc: Andi Kleen <ak@suse.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
---
arch/x86_64/kernel/Makefile | 3 ++-
arch/x86_64/kernel/bugs.c | 28 ++++++++++++++++++++++++++++
include/asm-x86_64/alternative.h | 1 +
include/asm-x86_64/bugs.h | 30 ++++--------------------------
4 files changed, 35 insertions(+), 27 deletions(-)
===================================================================
--- a/arch/x86_64/kernel/Makefile
+++ b/arch/x86_64/kernel/Makefile
@@ -8,7 +8,8 @@ obj-y := process.o signal.o entry.o trap
ptrace.o time.o ioport.o ldt.o setup.o i8259.o sys_x86_64.o \
x8664_ksyms.o i387.o syscall.o vsyscall.o \
setup64.o bootflag.o e820.o reboot.o quirks.o i8237.o \
- pci-dma.o pci-nommu.o alternative.o hpet.o tsc.o sched-clock.o
+ pci-dma.o pci-nommu.o alternative.o hpet.o tsc.o sched-clock.o \
+ bugs.o
obj-$(CONFIG_STACKTRACE) += stacktrace.o
obj-$(CONFIG_X86_MCE) += mce.o therm_throt.o
===================================================================
--- /dev/null
+++ b/arch/x86_64/kernel/bugs.c
@@ -0,0 +1,28 @@
+/*
+ * arch/x86_64/kernel/bugs.c
+ *
+ * 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 <linux/kernel.h>
+#include <asm/alternative.h>
+#include <asm/processor.h>
+#include <asm/i387.h>
+#include <asm/msr.h>
+#include <asm/pda.h>
+
+void __init check_bugs(void)
+{
+ identify_cpu(&boot_cpu_data);
+#if !defined(CONFIG_SMP)
+ printk("CPU: ");
+ print_cpu_info(&boot_cpu_data);
+#endif
+ alternative_instructions();
+}
===================================================================
--- a/include/asm-x86_64/alternative.h
+++ b/include/asm-x86_64/alternative.h
@@ -16,6 +16,7 @@ struct alt_instr {
u8 pad[5];
};
+extern void alternative_instructions(void);
extern void apply_alternatives(struct alt_instr *start, struct alt_instr *end);
struct module;
===================================================================
--- a/include/asm-x86_64/bugs.h
+++ b/include/asm-x86_64/bugs.h
@@ -1,28 +1,6 @@
-/*
- * include/asm-x86_64/bugs.h
- *
- * 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);
- */
+#ifndef _ASM_X86_64_BUGS_H
+#define _ASM_X86_64_BUGS_H
-#include <asm/processor.h>
-#include <asm/i387.h>
-#include <asm/msr.h>
-#include <asm/pda.h>
+void check_bugs(void);
-extern void alternative_instructions(void);
-
-static void __init check_bugs(void)
-{
- identify_cpu(&boot_cpu_data);
-#if !defined(CONFIG_SMP)
- printk("CPU: ");
- print_cpu_info(&boot_cpu_data);
-#endif
- alternative_instructions();
-}
+#endif /* _ASM_X86_64_BUGS_H */
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH 1/2] Clean up asm-x86_64/bugs.h
2007-04-07 17:22 [PATCH 1/2] Clean up asm-x86_64/bugs.h Jeremy Fitzhardinge
@ 2007-04-09 15:45 ` Randy Dunlap
2007-04-09 15:48 ` Jeremy Fitzhardinge
2007-04-09 15:49 ` Jeremy Fitzhardinge
0 siblings, 2 replies; 4+ messages in thread
From: Randy Dunlap @ 2007-04-09 15:45 UTC (permalink / raw)
To: Jeremy Fitzhardinge
Cc: Andrew Morton, Andi Kleen, Linus Torvalds,
Linux Kernel Mailing List, Virtualization Mailing List
On Sat, 07 Apr 2007 10:22:01 -0700 Jeremy Fitzhardinge wrote:
> Most of asm-x86_64/bugs.h is code which should be in a C file, so put it there.
>
> Signed-off-by: Jeremy Fitzhardinge <jeremy@xensource.com>
> Cc: Andi Kleen <ak@suse.de>
> Cc: Linus Torvalds <torvalds@linux-foundation.org>
>
> ---
> arch/x86_64/kernel/Makefile | 3 ++-
> arch/x86_64/kernel/bugs.c | 28 ++++++++++++++++++++++++++++
> include/asm-x86_64/alternative.h | 1 +
> include/asm-x86_64/bugs.h | 30 ++++--------------------------
> 4 files changed, 35 insertions(+), 27 deletions(-)
>
> ===================================================================
> --- /dev/null
> +++ b/arch/x86_64/kernel/bugs.c
> @@ -0,0 +1,28 @@
> +/*
> + * arch/x86_64/kernel/bugs.c
> + *
> + * Copyright (C) 1994 Linus Torvalds
> + * Copyright (C) 2000 SuSE
> + *
> + * This is included by init/main.c to check for architecture-dependent bugs.
drop comment.
Are you going to tackle asm-i386/bugs.h also?
Thanks.
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] Clean up asm-x86_64/bugs.h
2007-04-09 15:45 ` Randy Dunlap
@ 2007-04-09 15:48 ` Jeremy Fitzhardinge
2007-04-09 15:49 ` Jeremy Fitzhardinge
1 sibling, 0 replies; 4+ messages in thread
From: Jeremy Fitzhardinge @ 2007-04-09 15:48 UTC (permalink / raw)
To: Randy Dunlap
Cc: Andrew Morton, Virtualization Mailing List, Linus Torvalds,
Linux Kernel Mailing List
Randy Dunlap wrote:
> On Sat, 07 Apr 2007 10:22:01 -0700 Jeremy Fitzhardinge wrote:
>
>
>> Most of asm-x86_64/bugs.h is code which should be in a C file, so put it there.
>>
>> Signed-off-by: Jeremy Fitzhardinge <jeremy@xensource.com>
>> Cc: Andi Kleen <ak@suse.de>
>> Cc: Linus Torvalds <torvalds@linux-foundation.org>
>>
>> ---
>> arch/x86_64/kernel/Makefile | 3 ++-
>> arch/x86_64/kernel/bugs.c | 28 ++++++++++++++++++++++++++++
>> include/asm-x86_64/alternative.h | 1 +
>> include/asm-x86_64/bugs.h | 30 ++++--------------------------
>> 4 files changed, 35 insertions(+), 27 deletions(-)
>>
>> ===================================================================
>> --- /dev/null
>> +++ b/arch/x86_64/kernel/bugs.c
>> @@ -0,0 +1,28 @@
>> +/*
>> + * arch/x86_64/kernel/bugs.c
>> + *
>> + * Copyright (C) 1994 Linus Torvalds
>> + * Copyright (C) 2000 SuSE
>> + *
>> + * This is included by init/main.c to check for architecture-dependent bugs.
>>
>
> drop comment.
>
> Are you going to tackle asm-i386/bugs.h also?
Yes, I'd already sent it out. This was just the response to "please
make them consistent".
J
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH 1/2] Clean up asm-x86_64/bugs.h
2007-04-09 15:45 ` Randy Dunlap
2007-04-09 15:48 ` Jeremy Fitzhardinge
@ 2007-04-09 15:49 ` Jeremy Fitzhardinge
1 sibling, 0 replies; 4+ messages in thread
From: Jeremy Fitzhardinge @ 2007-04-09 15:49 UTC (permalink / raw)
To: Randy Dunlap
Cc: Andrew Morton, Andi Kleen, Linus Torvalds,
Linux Kernel Mailing List, Virtualization Mailing List
Randy Dunlap wrote:
> On Sat, 07 Apr 2007 10:22:01 -0700 Jeremy Fitzhardinge wrote:
>
>
>> Most of asm-x86_64/bugs.h is code which should be in a C file, so put it there.
>>
>> Signed-off-by: Jeremy Fitzhardinge <jeremy@xensource.com>
>> Cc: Andi Kleen <ak@suse.de>
>> Cc: Linus Torvalds <torvalds@linux-foundation.org>
>>
>> ---
>> arch/x86_64/kernel/Makefile | 3 ++-
>> arch/x86_64/kernel/bugs.c | 28 ++++++++++++++++++++++++++++
>> include/asm-x86_64/alternative.h | 1 +
>> include/asm-x86_64/bugs.h | 30 ++++--------------------------
>> 4 files changed, 35 insertions(+), 27 deletions(-)
>>
>> ===================================================================
>> --- /dev/null
>> +++ b/arch/x86_64/kernel/bugs.c
>> @@ -0,0 +1,28 @@
>> +/*
>> + * arch/x86_64/kernel/bugs.c
>> + *
>> + * Copyright (C) 1994 Linus Torvalds
>> + * Copyright (C) 2000 SuSE
>> + *
>> + * This is included by init/main.c to check for architecture-dependent bugs.
>>
>
> drop comment.
I'll edit it, but I won't remove the copyrights.
J
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2007-04-09 15:49 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-04-07 17:22 [PATCH 1/2] Clean up asm-x86_64/bugs.h Jeremy Fitzhardinge
2007-04-09 15:45 ` Randy Dunlap
2007-04-09 15:48 ` Jeremy Fitzhardinge
2007-04-09 15:49 ` Jeremy Fitzhardinge
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).