diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-21 20:38:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-21 20:38:51 -0700 |
| commit | 6df8cd3d4f921762504c4d1e7ed702b745702543 (patch) | |
| tree | b671af9557db240bbc880ddbaebea471338fa7a0 /arch/sparc/kernel/smp.c | |
| parent | 08f1c192c3c32797068bfe97738babb3295bbf42 (diff) | |
| parent | 3167d93fc0cb81541dea551dc14411ed211eb9e0 (diff) | |
| download | op-kernel-dev-6df8cd3d4f921762504c4d1e7ed702b745702543.zip op-kernel-dev-6df8cd3d4f921762504c4d1e7ed702b745702543.tar.gz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: ERROR: "sys_ioctl" [arch/sparc64/solaris/solaris.ko] undefined!
[SPARC32]: Make PAGE_SHARED a read-mostly variable.
[SPARC32]: Take enable_irq/disable_irq out of line.
[SPARC32]: clean include/asm-sparc/irq.h
[SPARC32]: Fix rounding errors in ndelay/udelay implementation.
Diffstat (limited to 'arch/sparc/kernel/smp.c')
| -rw-r--r-- | arch/sparc/kernel/smp.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/sparc/kernel/smp.c b/arch/sparc/kernel/smp.c index 4fea3ac..6724ab9 100644 --- a/arch/sparc/kernel/smp.c +++ b/arch/sparc/kernel/smp.c @@ -33,6 +33,8 @@ #include <asm/tlbflush.h> #include <asm/cpudata.h> +#include "irq.h" + int smp_num_cpus = 1; volatile unsigned long cpu_callin_map[NR_CPUS] __initdata = {0,}; unsigned char boot_cpu_id = 0; |
