From 33264d92ba6fcc9767bdb9d1b52e5b066c984c87 Mon Sep 17 00:00:00 2001 From: Marcel Moolenaar Date: Sun, 5 May 2002 08:18:42 +0000 Subject: [PATCH] o Include md_var.h o Remove definition of struct ia64_fdesc o Remove prototype of os_boot_rendez o Use the FDESC_FUNC and FDESC_GP abstractions --- sys/ia64/ia64/sal.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/sys/ia64/ia64/sal.c b/sys/ia64/ia64/sal.c index fc051d5da58b..ee1504286870 100644 --- a/sys/ia64/ia64/sal.c +++ b/sys/ia64/ia64/sal.c @@ -32,22 +32,16 @@ #include #include #include +#include #include #include -struct ia64_fdesc { - u_int64_t func; - u_int64_t gp; -}; - static struct ia64_fdesc sal_fdesc; static sal_entry_t fake_sal; extern u_int64_t ia64_pal_entry; sal_entry_t *ia64_sal_entry = fake_sal; -void os_boot_rendez(void); - static struct ia64_sal_result fake_sal(u_int64_t a1, u_int64_t a2, u_int64_t a3, u_int64_t a4, u_int64_t a5, u_int64_t a6, u_int64_t a7, u_int64_t a8) @@ -96,7 +90,6 @@ ia64_sal_init(struct sal_system_table *saltab) struct sal_ap_wakeup_descriptor *dp; #ifdef SMP struct ia64_sal_result result; - struct ia64_fdesc *fptr = (void*)os_boot_rendez; int ipi; #endif @@ -111,8 +104,10 @@ ia64_sal_init(struct sal_system_table *saltab) mp_ipi_vector[ipi] = dp->sale_vector + ipi; result = ia64_sal_entry(SAL_SET_VECTORS, - SAL_OS_BOOT_RENDEZ, ia64_tpa(fptr->func), - ia64_tpa(fptr->gp), 0, 0, 0, 0); + SAL_OS_BOOT_RENDEZ, + ia64_tpa(FDESC_FUNC(os_boot_rendez)), + ia64_tpa(FDESC_GP(os_boot_rendez)), + 0, 0, 0, 0); mp_hardware = 1; #endif