All of lore.kernel.org
 help / color / mirror / Atom feed
From: Matthew Garrett <mjg59@srcf.ucam.org>
To: mactel-linux-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org
Subject: [PATCH] Remove __init from efi_get_time
Date: Sat, 4 Mar 2006 18:04:01 +0000	[thread overview]
Message-ID: <20060304180359.GA3775@srcf.ucam.org> (raw)
In-Reply-To: <20060304180018.GA3695@srcf.ucam.org>

The comment above efi_get_time claims:

Note, this call isn't used later, so mark it __init.

Unfortunately, it's not true - it's called during suspend as well, 
leading to nasty explosions.

Signed-off-by: Matthew Garrett <mjg59@srcf.ucam.org>

diff --git a/arch/i386/kernel/efi.c b/arch/i386/kernel/efi.c
index ecad519..6be705e 100644
--- a/arch/i386/kernel/efi.c
+++ b/arch/i386/kernel/efi.c
@@ -193,9 +193,9 @@ inline int efi_set_rtc_mmss(unsigned lon
 /*
  * This should only be used during kernel init and before runtime
  * services have been remapped, therefore, we'll need to call in physical
- * mode.  Note, this call isn't used later, so mark it __init.
+ * mode.
  */
-inline unsigned long __init efi_get_time(void)
+inline unsigned long efi_get_time(void)
 {
 	efi_status_t status;
 	efi_time_t eft;
diff --git a/include/linux/efi.h b/include/linux/efi.h
index c7c5dd3..9e97bc2 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -295,7 +295,7 @@ extern u64 efi_mem_attributes (unsigned 
 extern int __init efi_uart_console_only (void);
 extern void efi_initialize_iomem_resources(struct resource *code_resource,
 					struct resource *data_resource);
-extern unsigned long __init efi_get_time(void);
+extern unsigned long efi_get_time(void);
 extern int __init efi_set_rtc_mmss(unsigned long nowtime);
 extern struct efi_memory_map memmap;
 
-- 
Matthew Garrett | mjg59@srcf.ucam.org

  reply	other threads:[~2006-03-04 18:04 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-03-04 18:00 [PATCH] /sys/firmware/efi/systab giving incorrect value for smbios Matthew Garrett
2006-03-04 18:04 ` Matthew Garrett [this message]
2006-03-04 19:00 ` Matthew Garrett
2006-03-04 19:04   ` [Mactel-linux-devel] " gimli
2006-03-04 19:17     ` Matthew Garrett

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20060304180359.GA3775@srcf.ucam.org \
    --to=mjg59@srcf.ucam.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mactel-linux-devel@lists.sourceforge.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.