aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/kernel/e820_64.c1
-rw-r--r--arch/x86/kernel/head64.c1
-rw-r--r--arch/x86/kernel/process_32.c1
-rw-r--r--arch/x86/mm/init_64.c1
-rw-r--r--include/asm-x86/arch_hooks.h5
-rw-r--r--include/asm-x86/kdebug.h5
-rw-r--r--include/asm-x86/processor_32.h1
-rw-r--r--include/asm-x86/proto.h8
-rw-r--r--include/asm-x86/system_32.h1
9 files changed, 10 insertions, 14 deletions
diff --git a/arch/x86/kernel/e820_64.c b/arch/x86/kernel/e820_64.c
index d41cd2f01733..e510cfd5bb71 100644
--- a/arch/x86/kernel/e820_64.c
+++ b/arch/x86/kernel/e820_64.c
@@ -26,6 +26,7 @@
26#include <asm/proto.h> 26#include <asm/proto.h>
27#include <asm/setup.h> 27#include <asm/setup.h>
28#include <asm/sections.h> 28#include <asm/sections.h>
29#include <asm/kdebug.h>
29 30
30struct e820map e820; 31struct e820map e820;
31 32
diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
index 6b3469311e42..d156bfbffa9a 100644
--- a/arch/x86/kernel/head64.c
+++ b/arch/x86/kernel/head64.c
@@ -19,6 +19,7 @@
19#include <asm/pgtable.h> 19#include <asm/pgtable.h>
20#include <asm/tlbflush.h> 20#include <asm/tlbflush.h>
21#include <asm/sections.h> 21#include <asm/sections.h>
22#include <asm/kdebug.h>
22 23
23static void __init zap_identity_mappings(void) 24static void __init zap_identity_mappings(void)
24{ 25{
diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
index a63d2d2556ee..a8cdd09ad53f 100644
--- a/arch/x86/kernel/process_32.c
+++ b/arch/x86/kernel/process_32.c
@@ -55,6 +55,7 @@
55 55
56#include <asm/tlbflush.h> 56#include <asm/tlbflush.h>
57#include <asm/cpu.h> 57#include <asm/cpu.h>
58#include <asm/kdebug.h>
58 59
59asmlinkage void ret_from_fork(void) __asm__("ret_from_fork"); 60asmlinkage void ret_from_fork(void) __asm__("ret_from_fork");
60 61
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 0f9c8c890658..9677abb6cf8a 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -43,6 +43,7 @@
43#include <asm/proto.h> 43#include <asm/proto.h>
44#include <asm/smp.h> 44#include <asm/smp.h>
45#include <asm/sections.h> 45#include <asm/sections.h>
46#include <asm/kdebug.h>
46 47
47#ifndef Dprintk 48#ifndef Dprintk
48#define Dprintk(x...) 49#define Dprintk(x...)
diff --git a/include/asm-x86/arch_hooks.h b/include/asm-x86/arch_hooks.h
index a8c1fca9726d..768aee8a04ef 100644
--- a/include/asm-x86/arch_hooks.h
+++ b/include/asm-x86/arch_hooks.h
@@ -6,7 +6,7 @@
6/* 6/*
7 * linux/include/asm/arch_hooks.h 7 * linux/include/asm/arch_hooks.h
8 * 8 *
9 * define the architecture specific hooks 9 * define the architecture specific hooks
10 */ 10 */
11 11
12/* these aren't arch hooks, they are generic routines 12/* these aren't arch hooks, they are generic routines
@@ -24,7 +24,4 @@ extern void trap_init_hook(void);
24extern void time_init_hook(void); 24extern void time_init_hook(void);
25extern void mca_nmi_hook(void); 25extern void mca_nmi_hook(void);
26 26
27extern int setup_early_printk(char *);
28extern void early_printk(const char *fmt, ...) __attribute__((format(printf,1,2)));
29
30#endif 27#endif
diff --git a/include/asm-x86/kdebug.h b/include/asm-x86/kdebug.h
index e2f9b62e535e..49e5c91d490c 100644
--- a/include/asm-x86/kdebug.h
+++ b/include/asm-x86/kdebug.h
@@ -22,10 +22,15 @@ enum die_val {
22 DIE_PAGE_FAULT, 22 DIE_PAGE_FAULT,
23}; 23};
24 24
25extern void early_printk(const char *fmt, ...) __attribute__((format(printf,1,2)));
25extern void printk_address(unsigned long address); 26extern void printk_address(unsigned long address);
26extern void die(const char *,struct pt_regs *,long); 27extern void die(const char *,struct pt_regs *,long);
27extern void __die(const char *,struct pt_regs *,long); 28extern void __die(const char *,struct pt_regs *,long);
28extern void show_registers(struct pt_regs *regs); 29extern void show_registers(struct pt_regs *regs);
30extern void __show_registers(struct pt_regs *, int all);
31extern void show_trace(struct task_struct *, struct pt_regs *, unsigned long *);
32extern void __show_regs(struct pt_regs *regs);
33extern void show_regs(struct pt_regs *regs);
29extern void dump_pagetable(unsigned long); 34extern void dump_pagetable(unsigned long);
30extern unsigned long oops_begin(void); 35extern unsigned long oops_begin(void);
31extern void oops_end(unsigned long); 36extern void oops_end(unsigned long);
diff --git a/include/asm-x86/processor_32.h b/include/asm-x86/processor_32.h
index 13976b086837..58880a1ddd65 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);
423extern int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags); 423extern int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags);
424 424
425extern unsigned long thread_saved_pc(struct task_struct *tsk); 425extern unsigned long thread_saved_pc(struct task_struct *tsk);
426void show_trace(struct task_struct *task, struct pt_regs *regs, unsigned long *stack);
427 426
428unsigned long get_wchan(struct task_struct *p); 427unsigned long get_wchan(struct task_struct *p);
429 428
diff --git a/include/asm-x86/proto.h b/include/asm-x86/proto.h
index 9b96dae5b7ac..b10cd1b82089 100644
--- a/include/asm-x86/proto.h
+++ b/include/asm-x86/proto.h
@@ -38,8 +38,6 @@ extern u32 pmtmr_ioport;
38#endif 38#endif
39extern int nohpet; 39extern int nohpet;
40 40
41extern void early_printk(const char *fmt, ...) __attribute__((format(printf,1,2)));
42
43extern void numa_initmem_init(unsigned long start_pfn, unsigned long end_pfn); 41extern void numa_initmem_init(unsigned long start_pfn, unsigned long end_pfn);
44extern unsigned long numa_free_all_bootmem(void); 42extern unsigned long numa_free_all_bootmem(void);
45 43
@@ -49,16 +47,10 @@ extern void load_gs_index(unsigned gs);
49 47
50extern unsigned long end_pfn_map; 48extern unsigned long end_pfn_map;
51 49
52extern void show_trace(struct task_struct *, struct pt_regs *, unsigned long * rsp);
53extern void show_registers(struct pt_regs *regs);
54
55extern void exception_table_check(void); 50extern void exception_table_check(void);
56 51
57extern void swap_low_mappings(void); 52extern void swap_low_mappings(void);
58 53
59extern void __show_regs(struct pt_regs * regs);
60extern void show_regs(struct pt_regs * regs);
61
62extern void syscall32_cpu_init(void); 54extern void syscall32_cpu_init(void);
63 55
64extern void setup_node_bootmem(int nodeid, unsigned long start, unsigned long end); 56extern 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 ef8468883bac..db6283eb5e46 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);
315extern void free_init_pages(char *what, unsigned long begin, unsigned long end); 315extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
316 316
317void default_idle(void); 317void default_idle(void);
318void __show_registers(struct pt_regs *, int all);
319 318
320#endif 319#endif