On Sun, 4 Jan 2004, Russell King wrote:
> On Sun, Jan 04, 2004 at 01:01:26AM +0100, Jesper Juhl wrote:
> > --- linux-2.6.1-rc1-mm1-orig/include/linux/efi.h 2003-12-31 05:48:26.000000000 +0100
> > +++ linux-2.6.1-rc1-mm1/include/linux/efi.h 2004-01-04 00:29:48.000000000 +0100
> > @@ -297,8 +297,8 @@ extern u64 efi_mem_attributes (unsigned
> > 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 inline __init efi_get_time(void);
> > -extern int inline __init efi_set_rtc_mmss(unsigned long nowtime);
> > +inline extern unsigned long __init efi_get_time(void);
> > +inline extern int __init efi_set_rtc_mmss(unsigned long nowtime);
>
> For the sake of consistency, can we keep these the same as the rest
> of the kernel code please? IOW:
>
> extern inline unsigned long __init efi_get_time(void);
>
Sure, I don't have a problem with that - good point, consistency is
important.
Here's the patch for efi.h again redone that way.
--- linux-2.6.1-rc1-mm1-orig/include/linux/efi.h 2003-12-31 05:48:26.000000000 +0100
+++ linux-2.6.1-rc1-mm1/include/linux/efi.h 2004-01-04 01:25:40.000000000 +0100
@@ -297,8 +297,8 @@ extern u64 efi_mem_attributes (unsigned
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 inline __init efi_get_time(void);
-extern int inline __init efi_set_rtc_mmss(unsigned long nowtime);
+extern inline unsigned long __init efi_get_time(void);
+extern inline int __init efi_set_rtc_mmss(unsigned long nowtime);
extern struct efi_memory_map memmap;
#ifdef CONFIG_EFI
/Jesper Juhl
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo _at_ vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
References:
- [minor & trivial patch] kill some potential warnings about inlinekeyword placement - 2.6.1-rc1-mm1Jesper Juhl
- Re: [minor & trivial patch] kill some potential warnings about inline keyword placement - 2.6.1-rc1-mm1Russell King
- Prev by Date: Re: [update] Vesafb problem since 2.5.51
- Next by Date: Re: inode_cache / dentry_cache not being reclaimed aggressivelyenough on low-memory PCs
- Previous by thread: Re: [minor & trivial patch] kill some potential warnings about inline keyword placement - 2.6.1-rc1-mm1
- Next by thread: Re: [PATCH linux-2.6.0-test10-mm1] dio-read-race-fix
- Indexes:[Main][Thread]