diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2007-10-27 03:17:01 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-27 03:17:01 -0400 |
commit | 64d329eec0313a071edd8176faf0a803012796d7 (patch) | |
tree | c6640d6fc75d13edbf6c477b99db7627a4acdc06 /arch/sparc/kernel | |
parent | d979f1792d1a4867eda0028b3aac8c6d4a535bb7 (diff) |
[SPARC32]: __inline__ --> inline
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/kernel')
-rw-r--r-- | arch/sparc/kernel/pcic.c | 2 | ||||
-rw-r--r-- | arch/sparc/kernel/process.c | 7 | ||||
-rw-r--r-- | arch/sparc/kernel/time.c | 9 |
3 files changed, 8 insertions, 10 deletions
diff --git a/arch/sparc/kernel/pcic.c b/arch/sparc/kernel/pcic.c index f2eae457fc9a..f2d432edc92d 100644 --- a/arch/sparc/kernel/pcic.c +++ b/arch/sparc/kernel/pcic.c | |||
@@ -753,7 +753,7 @@ void __init pci_time_init(void) | |||
753 | local_irq_enable(); | 753 | local_irq_enable(); |
754 | } | 754 | } |
755 | 755 | ||
756 | static __inline__ unsigned long do_gettimeoffset(void) | 756 | static inline unsigned long do_gettimeoffset(void) |
757 | { | 757 | { |
758 | /* | 758 | /* |
759 | * We divide all by 100 | 759 | * We divide all by 100 |
diff --git a/arch/sparc/kernel/process.c b/arch/sparc/kernel/process.c index 33f7a3ddb104..77460e316a03 100644 --- a/arch/sparc/kernel/process.c +++ b/arch/sparc/kernel/process.c | |||
@@ -1,7 +1,6 @@ | |||
1 | /* $Id: process.c,v 1.161 2002/01/23 11:27:32 davem Exp $ | 1 | /* linux/arch/sparc/kernel/process.c |
2 | * linux/arch/sparc/kernel/process.c | ||
3 | * | 2 | * |
4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 3 | * Copyright (C) 1995 David S. Miller (davem@davemloft.net) |
5 | * Copyright (C) 1996 Eddie C. Dost (ecd@skynet.be) | 4 | * Copyright (C) 1996 Eddie C. Dost (ecd@skynet.be) |
6 | */ | 5 | */ |
7 | 6 | ||
@@ -397,7 +396,7 @@ void flush_thread(void) | |||
397 | } | 396 | } |
398 | } | 397 | } |
399 | 398 | ||
400 | static __inline__ struct sparc_stackf __user * | 399 | static inline struct sparc_stackf __user * |
401 | clone_stackframe(struct sparc_stackf __user *dst, | 400 | clone_stackframe(struct sparc_stackf __user *dst, |
402 | struct sparc_stackf __user *src) | 401 | struct sparc_stackf __user *src) |
403 | { | 402 | { |
diff --git a/arch/sparc/kernel/time.c b/arch/sparc/kernel/time.c index 4bf78a5e8e0f..45cb7c5286d7 100644 --- a/arch/sparc/kernel/time.c +++ b/arch/sparc/kernel/time.c | |||
@@ -1,7 +1,6 @@ | |||
1 | /* $Id: time.c,v 1.60 2002/01/23 14:33:55 davem Exp $ | 1 | /* linux/arch/sparc/kernel/time.c |
2 | * linux/arch/sparc/kernel/time.c | ||
3 | * | 2 | * |
4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 3 | * Copyright (C) 1995 David S. Miller (davem@davemloft.net) |
5 | * Copyright (C) 1996 Thomas K. Dyas (tdyas@eden.rutgers.edu) | 4 | * Copyright (C) 1996 Thomas K. Dyas (tdyas@eden.rutgers.edu) |
6 | * | 5 | * |
7 | * Chris Davis (cdavis@cois.on.ca) 03/27/1998 | 6 | * Chris Davis (cdavis@cois.on.ca) 03/27/1998 |
@@ -210,7 +209,7 @@ static void __devinit kick_start_clock(void) | |||
210 | } | 209 | } |
211 | 210 | ||
212 | /* Return nonzero if the clock chip battery is low. */ | 211 | /* Return nonzero if the clock chip battery is low. */ |
213 | static __inline__ int has_low_battery(void) | 212 | static inline int has_low_battery(void) |
214 | { | 213 | { |
215 | struct mostek48t02 *regs = (struct mostek48t02 *)mstk48t02_regs; | 214 | struct mostek48t02 *regs = (struct mostek48t02 *)mstk48t02_regs; |
216 | unsigned char data1, data2; | 215 | unsigned char data1, data2; |
@@ -252,7 +251,7 @@ static void __devinit mostek_set_system_time(void) | |||
252 | } | 251 | } |
253 | 252 | ||
254 | /* Probe for the real time clock chip on Sun4 */ | 253 | /* Probe for the real time clock chip on Sun4 */ |
255 | static __inline__ void sun4_clock_probe(void) | 254 | static inline void sun4_clock_probe(void) |
256 | { | 255 | { |
257 | #ifdef CONFIG_SUN4 | 256 | #ifdef CONFIG_SUN4 |
258 | int temp; | 257 | int temp; |