[2.6 patch] i386 efi.c: make some code static (fwd)

[Adrian Bunk]

The patch forwarded below still applies and compiles against 
2.6.11-rc1-mm1.

Please apply.


----- Forwarded message from Adrian Bunk <bunk@xxxxxxxxx> -----

Date:	Wed, 1 Dec 2004 22:42:04 +0100
From: Adrian Bunk <bunk@xxxxxxxxx>
To: linux-kernel@xxxxxxxxxxxxxxx
Subject: [2.6 patch] i386 efi.c: make some code static

The patch below makes one struct and two functions static.

Additionally, print_efi_memmap is only required #if EFI_DEBUG.


diffstat output:
 arch/i386/kernel/efi.c |    8 +++++---
 include/linux/efi.h    |    1 -
 2 files changed, 5 insertions(+), 4 deletions(-)


Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>

--- linux-2.6.10-rc2-mm4-full/include/linux/efi.h.old	2004-12-01 07:56:59.000000000 +0100
+++ linux-2.6.10-rc2-mm4-full/include/linux/efi.h	2004-12-01 07:57:09.000000000 +0100
@@ -300,7 +300,6 @@
 extern int __init efi_uart_console_only (void);
 extern void efi_initialize_iomem_resources(struct resource *code_resource,
 					struct resource *data_resource);
-extern efi_status_t phys_efi_get_time(efi_time_t *tm, efi_time_cap_t *tc);
 extern unsigned long __init efi_get_time(void);
 extern int __init efi_set_rtc_mmss(unsigned long nowtime);
 extern struct efi_memory_map memmap;
--- linux-2.6.10-rc2-mm4-full/arch/i386/kernel/efi.c.old	2004-12-01 07:56:26.000000000 +0100
+++ linux-2.6.10-rc2-mm4-full/arch/i386/kernel/efi.c	2004-12-01 08:07:19.000000000 +0100
@@ -46,7 +46,7 @@
 
 struct efi efi;
 EXPORT_SYMBOL(efi);
-struct efi efi_phys __initdata;
+static struct efi efi_phys __initdata;
 struct efi_memory_map memmap __initdata;
 
 /*
@@ -151,7 +151,7 @@
 	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;
@@ -240,7 +240,8 @@
 		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;
@@ -254,6 +255,7 @@
 			(md->num_pages >> (20 - EFI_PAGE_SHIFT)));
 	}
 }
+#endif  /*  EFI_DEBUG  */
 
 /*
  * Walks the EFI memory map and calls CALLBACK once for each EFI

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

----- End forwarded message -----


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/