aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-x86
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-01-30 07:31:17 -0500
committerIngo Molnar <mingo@elte.hu>2008-01-30 07:31:17 -0500
commit341d8854d38fe6e7655f7748babae5c25a51aa70 (patch)
tree38c2baa4db7755e3a8cb359238fbb3073d6e0b7b /include/asm-x86
parent75604d7f7f1ee93e4d19d9e19f4497b7ed842f2a (diff)
x86: remove fastcall from include/asm-x86
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/asm-x86')
-rw-r--r--include/asm-x86/apic.h6
-rw-r--r--include/asm-x86/hw_irq_32.h14
-rw-r--r--include/asm-x86/mutex_32.h7
-rw-r--r--include/asm-x86/semaphore_32.h8
4 files changed, 17 insertions, 18 deletions
diff --git a/include/asm-x86/apic.h b/include/asm-x86/apic.h
index 423022759cb2..72bf09cf13ab 100644
--- a/include/asm-x86/apic.h
+++ b/include/asm-x86/apic.h
@@ -59,17 +59,17 @@ extern unsigned boot_cpu_id;
59#define setup_secondary_clock setup_secondary_APIC_clock 59#define setup_secondary_clock setup_secondary_APIC_clock
60#endif 60#endif
61 61
62static inline fastcall void native_apic_write(unsigned long reg, u32 v) 62static inline void native_apic_write(unsigned long reg, u32 v)
63{ 63{
64 *((volatile u32 *)(APIC_BASE + reg)) = v; 64 *((volatile u32 *)(APIC_BASE + reg)) = v;
65} 65}
66 66
67static inline fastcall void native_apic_write_atomic(unsigned long reg, u32 v) 67static inline void native_apic_write_atomic(unsigned long reg, u32 v)
68{ 68{
69 (void) xchg((u32*)(APIC_BASE + reg), v); 69 (void) xchg((u32*)(APIC_BASE + reg), v);
70} 70}
71 71
72static inline fastcall u32 native_apic_read(unsigned long reg) 72static inline u32 native_apic_read(unsigned long reg)
73{ 73{
74 return *((volatile u32 *)(APIC_BASE + reg)); 74 return *((volatile u32 *)(APIC_BASE + reg));
75} 75}
diff --git a/include/asm-x86/hw_irq_32.h b/include/asm-x86/hw_irq_32.h
index 0bedbdf5e907..b93e35a708ac 100644
--- a/include/asm-x86/hw_irq_32.h
+++ b/include/asm-x86/hw_irq_32.h
@@ -29,16 +29,16 @@
29extern void (*interrupt[NR_IRQS])(void); 29extern void (*interrupt[NR_IRQS])(void);
30 30
31#ifdef CONFIG_SMP 31#ifdef CONFIG_SMP
32fastcall void reschedule_interrupt(void); 32void reschedule_interrupt(void);
33fastcall void invalidate_interrupt(void); 33void invalidate_interrupt(void);
34fastcall void call_function_interrupt(void); 34void call_function_interrupt(void);
35#endif 35#endif
36 36
37#ifdef CONFIG_X86_LOCAL_APIC 37#ifdef CONFIG_X86_LOCAL_APIC
38fastcall void apic_timer_interrupt(void); 38void apic_timer_interrupt(void);
39fastcall void error_interrupt(void); 39void error_interrupt(void);
40fastcall void spurious_interrupt(void); 40void spurious_interrupt(void);
41fastcall void thermal_interrupt(void); 41void thermal_interrupt(void);
42#define platform_legacy_irq(irq) ((irq) < 16) 42#define platform_legacy_irq(irq) ((irq) < 16)
43#endif 43#endif
44 44
diff --git a/include/asm-x86/mutex_32.h b/include/asm-x86/mutex_32.h
index 7a17d9e58ad6..bbeefb96ddfd 100644
--- a/include/asm-x86/mutex_32.h
+++ b/include/asm-x86/mutex_32.h
@@ -26,7 +26,7 @@ do { \
26 unsigned int dummy; \ 26 unsigned int dummy; \
27 \ 27 \
28 typecheck(atomic_t *, count); \ 28 typecheck(atomic_t *, count); \
29 typecheck_fn(fastcall void (*)(atomic_t *), fail_fn); \ 29 typecheck_fn(void (*)(atomic_t *), fail_fn); \
30 \ 30 \
31 __asm__ __volatile__( \ 31 __asm__ __volatile__( \
32 LOCK_PREFIX " decl (%%eax) \n" \ 32 LOCK_PREFIX " decl (%%eax) \n" \
@@ -51,8 +51,7 @@ do { \
51 * or anything the slow path function returns 51 * or anything the slow path function returns
52 */ 52 */
53static inline int 53static inline int
54__mutex_fastpath_lock_retval(atomic_t *count, 54__mutex_fastpath_lock_retval(atomic_t *count, int (*fail_fn)(atomic_t *))
55 int fastcall (*fail_fn)(atomic_t *))
56{ 55{
57 if (unlikely(atomic_dec_return(count) < 0)) 56 if (unlikely(atomic_dec_return(count) < 0))
58 return fail_fn(count); 57 return fail_fn(count);
@@ -78,7 +77,7 @@ do { \
78 unsigned int dummy; \ 77 unsigned int dummy; \
79 \ 78 \
80 typecheck(atomic_t *, count); \ 79 typecheck(atomic_t *, count); \
81 typecheck_fn(fastcall void (*)(atomic_t *), fail_fn); \ 80 typecheck_fn(void (*)(atomic_t *), fail_fn); \
82 \ 81 \
83 __asm__ __volatile__( \ 82 __asm__ __volatile__( \
84 LOCK_PREFIX " incl (%%eax) \n" \ 83 LOCK_PREFIX " incl (%%eax) \n" \
diff --git a/include/asm-x86/semaphore_32.h b/include/asm-x86/semaphore_32.h
index 835c1d751a9f..cc826e85323f 100644
--- a/include/asm-x86/semaphore_32.h
+++ b/include/asm-x86/semaphore_32.h
@@ -83,10 +83,10 @@ static inline void init_MUTEX_LOCKED (struct semaphore *sem)
83 sema_init(sem, 0); 83 sema_init(sem, 0);
84} 84}
85 85
86fastcall void __down_failed(void /* special register calling convention */); 86void __down_failed(void /* special register calling convention */);
87fastcall int __down_failed_interruptible(void /* params in registers */); 87int __down_failed_interruptible(void /* params in registers */);
88fastcall int __down_failed_trylock(void /* params in registers */); 88int __down_failed_trylock(void /* params in registers */);
89fastcall void __up_wakeup(void /* special register calling convention */); 89void __up_wakeup(void /* special register calling convention */);
90 90
91/* 91/*
92 * This is ugly, but we want the default case to fall through. 92 * This is ugly, but we want the default case to fall through.