diff -burNp --exclude-from=/home/mdomsch/excludes linux-2.4.17-pre5/arch/ia64/kernel/efi.c linux/arch/ia64/kernel/efi.c
--- linux-2.4.17-pre5/arch/ia64/kernel/efi.c	Fri Nov  9 16:26:17 2001
+++ linux/arch/ia64/kernel/efi.c	Sun Dec  9 13:37:20 2001
@@ -483,9 +483,22 @@ efi_get_iobase (void)
 }
 
 static void __exit
-efivars_exit(void)
+efi_exit(void)
 {
 #ifdef CONFIG_PROC_FS
  	remove_proc_entry(efi_dir->name, NULL);
 #endif
 }
+
+char * efi_guid_unparse(efi_guid_t *guid, char *out)
+{
+        if (out)
+                sprintf(out,
+                        "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",
+                        guid->data1, guid->data2, guid->data3,
+                        guid->data4[0], guid->data4[1], guid->data4[2],
+                        guid->data4[3],	guid->data4[4], guid->data4[5],
+                        guid->data4[6], guid->data4[7]);
+        return out;
+}
+
diff -burNp --exclude-from=/home/mdomsch/excludes linux-2.4.17-pre5/arch/ia64/kernel/efivars.c linux/arch/ia64/kernel/efivars.c
--- linux-2.4.17-pre5/arch/ia64/kernel/efivars.c	Fri Nov  9 16:26:17 2001
+++ linux/arch/ia64/kernel/efivars.c	Sun Dec  9 13:37:20 2001
@@ -139,19 +139,6 @@ proc_calc_metrics(char *page, char **sta
 }
 
 
-static void
-uuid_unparse(efi_guid_t *guid, char *out)
-{
-	sprintf(out, "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",
-		guid->data1, guid->data2, guid->data3,
-		guid->data4[0], guid->data4[1], guid->data4[2], guid->data4[3],
-		guid->data4[4], guid->data4[5], guid->data4[6], guid->data4[7]);
-}
-
-
-
-
-
 /*
  * efivar_create_proc_entry()
  * Requires:
@@ -194,7 +181,7 @@ efivar_create_proc_entry(unsigned long v
 	   private variables from another's.         */
 
 	*(short_name + strlen(short_name)) = '-';
-	uuid_unparse(vendor_guid, short_name + strlen(short_name));
+	efi_guid_unparse(vendor_guid, short_name + strlen(short_name));
 
 
 	/* Create the entry in proc */
diff -burNp --exclude-from=/home/mdomsch/excludes linux-2.4.17-pre5/arch/ia64/kernel/ia64_ksyms.c linux/arch/ia64/kernel/ia64_ksyms.c
--- linux-2.4.17-pre5/arch/ia64/kernel/ia64_ksyms.c	Fri Nov  9 16:26:17 2001
+++ linux/arch/ia64/kernel/ia64_ksyms.c	Sun Dec  9 13:37:20 2001
@@ -147,3 +147,6 @@ EXPORT_SYMBOL(efi);
 #include <linux/proc_fs.h>
 extern struct proc_dir_entry *efi_dir;
 EXPORT_SYMBOL(efi_dir);
+
+#include <asm/efi.h>
+EXPORT_SYMBOL(efi_guid_unparse);
diff -burNp --exclude-from=/home/mdomsch/excludes linux-2.4.17-pre5/include/asm-ia64/efi.h linux/include/asm-ia64/efi.h
--- linux-2.4.17-pre5/include/asm-ia64/efi.h	Tue Jul 31 12:30:09 2001
+++ linux/include/asm-ia64/efi.h	Sun Dec  9 13:36:33 2001
@@ -239,6 +239,7 @@ extern void efi_memmap_walk (efi_freemem
 extern void efi_gettimeofday (struct timeval *tv);
 extern void efi_enter_virtual_mode (void);	/* switch EFI to virtual mode, if possible */
 extern u64  efi_get_iobase (void);
+extern char * efi_guid_unparse (efi_guid_t *guid, char *out);
 
 /*
  * Variable Attributes