diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-21 23:38:51 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-21 23:38:51 -0400 |
| commit | 6df8cd3d4f921762504c4d1e7ed702b745702543 (patch) | |
| tree | b671af9557db240bbc880ddbaebea471338fa7a0 /arch/sparc64 | |
| parent | 08f1c192c3c32797068bfe97738babb3295bbf42 (diff) | |
| parent | 3167d93fc0cb81541dea551dc14411ed211eb9e0 (diff) | |
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/sparc64')
| -rw-r--r-- | arch/sparc64/kernel/sparc64_ksyms.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sparc64/kernel/sparc64_ksyms.c b/arch/sparc64/kernel/sparc64_ksyms.c index 7d36531aa5b9..d270c2f0be0f 100644 --- a/arch/sparc64/kernel/sparc64_ksyms.c +++ b/arch/sparc64/kernel/sparc64_ksyms.c | |||
| @@ -280,6 +280,7 @@ EXPORT_SYMBOL(sys_getgid); | |||
| 280 | EXPORT_SYMBOL(svr4_getcontext); | 280 | EXPORT_SYMBOL(svr4_getcontext); |
| 281 | EXPORT_SYMBOL(svr4_setcontext); | 281 | EXPORT_SYMBOL(svr4_setcontext); |
| 282 | EXPORT_SYMBOL(compat_sys_ioctl); | 282 | EXPORT_SYMBOL(compat_sys_ioctl); |
| 283 | EXPORT_SYMBOL(sys_ioctl); | ||
| 283 | EXPORT_SYMBOL(sparc32_open); | 284 | EXPORT_SYMBOL(sparc32_open); |
| 284 | #endif | 285 | #endif |
| 285 | 286 | ||