From 8e1b379f569672d4b23fe72075fb7207d251382c Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Mon, 19 Jan 2004 05:07:59 -0800 Subject: [PATCH] [PATCH] Fix weird placement of inline From: Jesper Juhl I'm compiling 2.6.1-rc1-mm1 with "-W -Wall" to look for potential problems and minor stuff to clean up. One of the things that enabling the extra warnings turn up is errors about the placement of the inline keyword. --- arch/i386/kernel/efi.c | 4 ++-- include/linux/efi.h | 4 ++-- kernel/posix-timers.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/i386/kernel/efi.c b/arch/i386/kernel/efi.c index 310090d060ec5..43a40b791ec48 100644 --- a/arch/i386/kernel/efi.c +++ b/arch/i386/kernel/efi.c @@ -174,7 +174,7 @@ phys_efi_get_time(efi_time_t *tm, efi_time_cap_t *tc) return status; } -int inline efi_set_rtc_mmss(unsigned long nowtime) +inline int efi_set_rtc_mmss(unsigned long nowtime) { int real_seconds, real_minutes; efi_status_t status; @@ -207,7 +207,7 @@ int inline efi_set_rtc_mmss(unsigned long nowtime) * services have been remapped, therefore, we'll need to call in physical * mode. Note, this call isn't used later, so mark it __init. */ -unsigned long inline __init efi_get_time(void) +inline unsigned long __init 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 86e9d2ebb5ebd..d6cac7ce314d3 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -297,8 +297,8 @@ extern u64 efi_mem_attributes (unsigned long phys_addr); 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 diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c index 431002eebb0a1..c06a7dc25da9d 100644 --- a/kernel/posix-timers.c +++ b/kernel/posix-timers.c @@ -574,7 +574,7 @@ static struct k_itimer * lock_timer(timer_t timer_id, unsigned long *flags) * it is the same as a requeue pending timer WRT to what we should * report. */ -void inline +inline void do_timer_gettime(struct k_itimer *timr, struct itimerspec *cur_setting) { unsigned long expires; -- 2.53.0