Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=718fc13b4675470ea191522ef98b02a55d990fa1
Commit: 718fc13b4675470ea191522ef98b02a55d990fa1
Parent: c9ff03428f24219b927d9d9d3c0c581622967794
Author: Thomas Gleixner <[EMAIL PROTECTED]>
AuthorDate: Wed Jan 30 13:30:17 2008 +0100
Committer: Ingo Molnar <[EMAIL PROTECTED]>
CommitDate: Wed Jan 30 13:30:17 2008 +0100
x86: move debug related declarations to kdebug.h
Move them and fixup some users.
Signed-off-by: Thomas Gleixner <[EMAIL PROTECTED]>
Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]>
---
arch/x86/kernel/e820_64.c | 1 +
arch/x86/kernel/head64.c | 1 +
arch/x86/kernel/process_32.c | 1 +
arch/x86/mm/init_64.c | 1 +
include/asm-x86/arch_hooks.h | 5 +----
include/asm-x86/kdebug.h | 5 +++++
include/asm-x86/processor_32.h | 1 -
include/asm-x86/proto.h | 8 --------
include/asm-x86/system_32.h | 1 -
9 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/arch/x86/kernel/e820_64.c b/arch/x86/kernel/e820_64.c
index d41cd2f..e510cfd 100644
--- a/arch/x86/kernel/e820_64.c
+++ b/arch/x86/kernel/e820_64.c
@@ -26,6 +26,7 @@
#include <asm/proto.h>
#include <asm/setup.h>
#include <asm/sections.h>
+#include <asm/kdebug.h>
struct e820map e820;
diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
index 6b34693..d156bfb 100644
--- a/arch/x86/kernel/head64.c
+++ b/arch/x86/kernel/head64.c
@@ -19,6 +19,7 @@
#include <asm/pgtable.h>
#include <asm/tlbflush.h>
#include <asm/sections.h>
+#include <asm/kdebug.h>
static void __init zap_identity_mappings(void)
{
diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
index a63d2d2..a8cdd09 100644
--- a/arch/x86/kernel/process_32.c
+++ b/arch/x86/kernel/process_32.c
@@ -55,6 +55,7 @@
#include <asm/tlbflush.h>
#include <asm/cpu.h>
+#include <asm/kdebug.h>
asmlinkage void ret_from_fork(void) __asm__("ret_from_fork");
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 0f9c8c8..9677abb 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -43,6 +43,7 @@
#include <asm/proto.h>
#include <asm/smp.h>
#include <asm/sections.h>
+#include <asm/kdebug.h>
#ifndef Dprintk
#define Dprintk(x...)
diff --git a/include/asm-x86/arch_hooks.h b/include/asm-x86/arch_hooks.h
index a8c1fca..768aee8 100644
--- a/include/asm-x86/arch_hooks.h
+++ b/include/asm-x86/arch_hooks.h
@@ -6,7 +6,7 @@
/*
* linux/include/asm/arch_hooks.h
*
- * define the architecture specific hooks
+ * define the architecture specific hooks
*/
/* these aren't arch hooks, they are generic routines
@@ -24,7 +24,4 @@ extern void trap_init_hook(void);
extern void time_init_hook(void);
extern void mca_nmi_hook(void);
-extern int setup_early_printk(char *);
-extern void early_printk(const char *fmt, ...)
__attribute__((format(printf,1,2)));
-
#endif
diff --git a/include/asm-x86/kdebug.h b/include/asm-x86/kdebug.h
index e2f9b62..49e5c91 100644
--- a/include/asm-x86/kdebug.h
+++ b/include/asm-x86/kdebug.h
@@ -22,10 +22,15 @@ enum die_val {
DIE_PAGE_FAULT,
};
+extern void early_printk(const char *fmt, ...)
__attribute__((format(printf,1,2)));
extern void printk_address(unsigned long address);
extern void die(const char *,struct pt_regs *,long);
extern void __die(const char *,struct pt_regs *,long);
extern void show_registers(struct pt_regs *regs);
+extern void __show_registers(struct pt_regs *, int all);
+extern void show_trace(struct task_struct *, struct pt_regs *, unsigned long
*);
+extern void __show_regs(struct pt_regs *regs);
+extern void show_regs(struct pt_regs *regs);
extern void dump_pagetable(unsigned long);
extern unsigned long oops_begin(void);
extern void oops_end(unsigned long);
diff --git a/include/asm-x86/processor_32.h b/include/asm-x86/processor_32.h
index 13976b0..58880a1 100644
--- a/include/asm-x86/processor_32.h
+++ b/include/asm-x86/processor_32.h
@@ -423,7 +423,6 @@ extern void prepare_to_copy(struct task_struct *tsk);
extern int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags);
extern unsigned long thread_saved_pc(struct task_struct *tsk);
-void show_trace(struct task_struct *task, struct pt_regs *regs, unsigned long
*stack);
unsigned long get_wchan(struct task_struct *p);
diff --git a/include/asm-x86/proto.h b/include/asm-x86/proto.h
index 9b96dae..b10cd1b 100644
--- a/include/asm-x86/proto.h
+++ b/include/asm-x86/proto.h
@@ -38,8 +38,6 @@ extern u32 pmtmr_ioport;
#endif
extern int nohpet;
-extern void early_printk(const char *fmt, ...)
__attribute__((format(printf,1,2)));
-
extern void numa_initmem_init(unsigned long start_pfn, unsigned long end_pfn);
extern unsigned long numa_free_all_bootmem(void);
@@ -49,16 +47,10 @@ extern void load_gs_index(unsigned gs);
extern unsigned long end_pfn_map;
-extern void show_trace(struct task_struct *, struct pt_regs *, unsigned long *
rsp);
-extern void show_registers(struct pt_regs *regs);
-
extern void exception_table_check(void);
extern void swap_low_mappings(void);
-extern void __show_regs(struct pt_regs * regs);
-extern void show_regs(struct pt_regs * regs);
-
extern void syscall32_cpu_init(void);
extern void setup_node_bootmem(int nodeid, unsigned long start, unsigned long
end);
diff --git a/include/asm-x86/system_32.h b/include/asm-x86/system_32.h
index ef84688..db6283e 100644
--- a/include/asm-x86/system_32.h
+++ b/include/asm-x86/system_32.h
@@ -315,6 +315,5 @@ extern unsigned long arch_align_stack(unsigned long sp);
extern void free_init_pages(char *what, unsigned long begin, unsigned long
end);
void default_idle(void);
-void __show_registers(struct pt_regs *, int all);
#endif
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
