git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 2.0 rc7
[linux-2.6.git]
/
arch
/
i386
/
kernel
/
efi.c
diff --git
a/arch/i386/kernel/efi.c
b/arch/i386/kernel/efi.c
index
8c3623b
..
f732f42
100644
(file)
--- a/
arch/i386/kernel/efi.c
+++ b/
arch/i386/kernel/efi.c
@@
-46,8
+46,8
@@
extern efi_status_t asmlinkage efi_call_phys(void *, ...);
struct efi efi;
EXPORT_SYMBOL(efi);
struct efi efi;
EXPORT_SYMBOL(efi);
-st
ruct efi efi_phys __initdata
;
-struct efi_memory_map memmap
__initdata
;
+st
atic struct efi efi_phys
;
+struct efi_memory_map memmap;
/*
* We require an early boot_ioremap mapping mechanism initially
/*
* We require an early boot_ioremap mapping mechanism initially
@@
-151,7
+151,7
@@
phys_efi_set_virtual_address_map(unsigned long memory_map_size,
return status;
}
return status;
}
-efi_status_t
+
static
efi_status_t
phys_efi_get_time(efi_time_t *tm, efi_time_cap_t *tc)
{
efi_status_t status;
phys_efi_get_time(efi_time_t *tm, efi_time_cap_t *tc)
{
efi_status_t status;
@@
-240,7
+240,8
@@
void __init efi_map_memmap(void)
printk(KERN_ERR PFX "Could not remap the EFI memmap!\n");
}
printk(KERN_ERR PFX "Could not remap the EFI memmap!\n");
}
-void __init print_efi_memmap(void)
+#if EFI_DEBUG
+static void __init print_efi_memmap(void)
{
efi_memory_desc_t *md;
int i;
{
efi_memory_desc_t *md;
int i;
@@
-254,6
+255,7
@@
void __init print_efi_memmap(void)
(md->num_pages >> (20 - EFI_PAGE_SHIFT)));
}
}
(md->num_pages >> (20 - EFI_PAGE_SHIFT)));
}
}
+#endif /* EFI_DEBUG */
/*
* Walks the EFI memory map and calls CALLBACK once for each EFI
/*
* Walks the EFI memory map and calls CALLBACK once for each EFI