From 8cfdb1db763958c3a44a7a1162dd38e70602ae1d Mon Sep 17 00:00:00 2001 From: Laurent Vivier Date: Sun, 22 May 2005 21:16:57 +0000 Subject: [PATCH] cast for entry, to support gcc 3.3 --- second/main.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/second/main.c b/second/main.c index e4c97da..ba72c23 100644 --- a/second/main.c +++ b/second/main.c @@ -57,6 +57,7 @@ int start(emile_l2_header_t* info) { char * kernel; #ifdef ARCH_M68K + unsigned long physical; entry_t entry; unsigned long physImage; disable_cache_t disable_cache; @@ -309,7 +310,8 @@ int start(emile_l2_header_t* info) start_mem); printf("Ok, booting the kernel.\n"); - ret = logical2physical(enter_kernel, (unsigned long*)&entry); + ret = logical2physical(enter_kernel, &physical); + entry = (entry_t)physical; if ( (ret == 0) && (enter_kernel != (unsigned long)entry) ) { @@ -317,7 +319,8 @@ int start(emile_l2_header_t* info) unsigned long size = end_enter_kernel - enter_kernel; logi = vga_get_video(); - ret = logical2physical(logi, (unsigned long*)&entry); + ret = logical2physical(logi, &physical); + entry = (entry_t)physical; memcpy((char*)logi, (char*)enter_kernel, size); memcpy((char*)entry, (char*)enter_kernel, size);