From 564a9984bdbf86a02cf4f0d848933a9fff4a1d18 Mon Sep 17 00:00:00 2001 From: Graeme Russ Date: Tue, 24 Nov 2009 20:04:18 +1100 Subject: i386: Rearrange Interupt Handling In preperation for full relocation Signed-off-by: Graeme Russ --- cpu/i386/cpu.c | 1 - 1 file changed, 1 deletion(-) (limited to 'cpu/i386/cpu.c') diff --git a/cpu/i386/cpu.c b/cpu/i386/cpu.c index d91e33b947..8baf37df16 100644 --- a/cpu/i386/cpu.c +++ b/cpu/i386/cpu.c @@ -48,7 +48,6 @@ int cpu_init(void) /* Initialize core interrupt and exception functionality of CPU */ cpu_init_interrupts (); - cpu_init_exceptions (); return 0; } -- cgit From 0fc1b49ecbd7ec7371f9ede0600e4fd28cec7f33 Mon Sep 17 00:00:00 2001 From: Graeme Russ Date: Tue, 24 Nov 2009 20:04:19 +1100 Subject: i386: Remove inline asm symbols from .dynsym Signed-off-by: Graeme Russ --- cpu/i386/cpu.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'cpu/i386/cpu.c') diff --git a/cpu/i386/cpu.c b/cpu/i386/cpu.c index 8baf37df16..4b681057a0 100644 --- a/cpu/i386/cpu.c +++ b/cpu/i386/cpu.c @@ -73,6 +73,8 @@ void __attribute__ ((regparm(0))) generate_gpf(void); /* segment 0x70 is an arbitrary segment which does not exist */ asm(".globl generate_gpf\n" + ".hidden generate_gpf\n" + ".type generate_gpf, @function\n" "generate_gpf:\n" "ljmp $0x70, $0x47114711\n"); -- cgit From 1c409bc7101a24ecd47a13a4e851845d66dc23ce Mon Sep 17 00:00:00 2001 From: Graeme Russ Date: Tue, 24 Nov 2009 20:04:21 +1100 Subject: i386: Final Relocation Signed-off-by: Graeme Russ --- cpu/i386/cpu.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'cpu/i386/cpu.c') diff --git a/cpu/i386/cpu.c b/cpu/i386/cpu.c index 4b681057a0..3010519e74 100644 --- a/cpu/i386/cpu.c +++ b/cpu/i386/cpu.c @@ -37,7 +37,7 @@ #include #include -int cpu_init(void) +int cpu_init_f(void) { /* initialize FPU, reset EM, set MP and NE */ asm ("fninit\n" \ @@ -46,9 +46,13 @@ int cpu_init(void) "orl $0x22, %eax\n" \ "movl %eax, %cr0\n" ); + return 0; +} + +int cpu_init_r(void) +{ /* Initialize core interrupt and exception functionality of CPU */ cpu_init_interrupts (); - return 0; } -- cgit