Skip to contentSkip to conversation

Clean up asm-x86_64/bugs.h

PATCH In review Jeremy Fitzhardinge 2 participants 4 messages Apr 7, 2007 – Apr 9, 2007 virtio core

lore
Share & tools
lore

Jeremy Fitzhardinge

author
#0 lore raw

PATCH 1/2 Clean up asm-x86_64/bugs.h

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 <[email protected]>
Cc Andi Kleen <[email protected]>
Cc Linus Torvalds <[email protected]>
---
 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(-)

===================================================================

arch/x86_64/kernel/Makefile +2 -1
@@ -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

===================================================================

arch/x86_64/kernel/bugs.c new file +28 -0
@@ -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();
+}

===================================================================

include/asm-x86_64/alternative.h +1 -0
@@ -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;

===================================================================

include/asm-x86_64/bugs.h +4 -26
@@ -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 */
#1 lore raw
Quoted 17 lines · 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 <[email protected]>
Cc Andi Kleen <[email protected]>
Cc Linus Torvalds <[email protected]>
---
 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(-)

===================================================================

arch/x86_64/kernel/bugs.c line 7

Quoted 7 lines
arch/x86_64/kernel/bugs.c new file +7 -0
@@ -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 ***

author
#2 lore raw
Quoted 31 lines · Randy Dunlap
Quoted 18 lines · 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 <[email protected]>
Cc Andi Kleen <[email protected]>
Cc Linus Torvalds <[email protected]>
---
 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(-)

===================================================================

arch/x86_64/kernel/bugs.c line 7

Quoted 7 lines
arch/x86_64/kernel/bugs.c new file +7 -0
@@ -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.

Quoted 1 line

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

author
#3 lore raw
In reply to Randy Dunlap
Quoted 16 lines · Randy Dunlap
Quoted 13 lines · 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 <[email protected]>
Cc Andi Kleen <[email protected]>
Cc Linus Torvalds <[email protected]>
---
 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(-)
Quoted 14 lines

arch/x86_64/kernel/bugs.c line 7

Quoted 12 lines

===================================================================

arch/x86_64/kernel/bugs.c new file +7 -0
@@ -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