diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-04-28 01:09:25 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-04-28 01:09:25 +0000 |
| commit | b9ba7aeb165cffecdffb60aec8c3fa8d590d9ca9 (patch) | |
| tree | 42d07b0c7246ae2536a702e7c5de9e2732341116 /arch/alpha/kernel/entry.S | |
| parent | 7406b0a326f2d70ade2671c37d1beef62249db97 (diff) | |
Merge with 2.3.99-pre6.
Diffstat (limited to 'arch/alpha/kernel/entry.S')
| -rw-r--r-- | arch/alpha/kernel/entry.S | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/alpha/kernel/entry.S b/arch/alpha/kernel/entry.S index 55e622d66..33d5eead1 100644 --- a/arch/alpha/kernel/entry.S +++ b/arch/alpha/kernel/entry.S @@ -4,6 +4,7 @@ * kernel entry-points */ +#include <linux/config.h> #include <asm/system.h> #define SIGCHLD 20 @@ -706,7 +707,7 @@ signal_return: br restore_all .end entSys -#ifdef __SMP__ +#ifdef CONFIG_SMP .globl ret_from_smp_fork .align 3 .ent ret_from_smp_fork @@ -715,7 +716,7 @@ ret_from_smp_fork: mov $17,$16 jsr $31,schedule_tail .end ret_from_smp_fork -#endif /* __SMP__ */ +#endif /* CONFIG_SMP */ .align 3 .ent reschedule |