diff options
| author | Andrew Morton <akpm@osdl.org> | 2004-02-24 16:12:37 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-02-24 16:12:37 -0800 |
| commit | 4c238c91c817410c329598be7d543621e4014b8a (patch) | |
| tree | 425068719329aa2f9fa218739dae53fd1a946773 /include | |
| parent | 0bab064232c278cb484b6aaa790b9c626ab6524b (diff) | |
[PATCH] asmlinkage fixes
From: Andreas Gruenbacher <agruen@suse.de>,
and me.
Latest gcc cvs is able to detect mismatches between functions which are
tagged asmlinkage and declarations which are missing asmlinkage. Or vice
versa.
Fix up the fallout from an x86 allyesconfig build.
Diffstat (limited to 'include')
| -rw-r--r-- | include/acpi/acpixf.h | 2 | ||||
| -rw-r--r-- | include/asm-i386/spinlock.h | 2 | ||||
| -rw-r--r-- | include/linux/preempt.h | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h index fcebceb3e23a..8ed497c30a64 100644 --- a/include/acpi/acpixf.h +++ b/include/acpi/acpixf.h @@ -446,7 +446,7 @@ acpi_status acpi_enter_sleep_state_prep ( u8 sleep_state); -acpi_status +acpi_status asmlinkage acpi_enter_sleep_state ( u8 sleep_state); diff --git a/include/asm-i386/spinlock.h b/include/asm-i386/spinlock.h index 47cb9c591a2e..e89511675001 100644 --- a/include/asm-i386/spinlock.h +++ b/include/asm-i386/spinlock.h @@ -7,7 +7,7 @@ #include <linux/config.h> #include <linux/compiler.h> -extern int printk(const char * fmt, ...) +asmlinkage int printk(const char * fmt, ...) __attribute__ ((format (printf, 1, 2))); /* diff --git a/include/linux/preempt.h b/include/linux/preempt.h index 0bd40fb2048f..a7ad90136d64 100644 --- a/include/linux/preempt.h +++ b/include/linux/preempt.h @@ -7,6 +7,7 @@ */ #include <linux/config.h> +#include <linux/linkage.h> #define preempt_count() (current_thread_info()->preempt_count) @@ -22,7 +23,7 @@ do { \ #ifdef CONFIG_PREEMPT -extern void preempt_schedule(void); +asmlinkage void preempt_schedule(void); #define preempt_disable() \ do { \ |