diff options
| author | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 18:16:28 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 18:16:28 -0800 |
| commit | 923215ae27c66dc2d25cc93ce1f7d3ef821c80bc (patch) | |
| tree | 8e0f3e6a424096be83ba1af0a5c7bd117a9c649f /kernel | |
| parent | 02947070b658af5e0d8abdc7ad8486423a143553 (diff) | |
v2.4.4.3 -> v2.4.4.4
- Russell King: ARM updates
- Al Viro: more init cleanups
- Cort Dougan: more PPC updates
- David Miller: cleanups, pci mmap updates
- Neil Brown: raid resync by sector
- Alan Cox: more merging with -ac
- Johannes Erdfelt: USB updates
- Kai Germaschewski: ISDN updates
- Tobias Ringstrom: dmfe.c network driver update
- Trond Myklebust: NFS client updates and cleanups
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/context.c | 2 | ||||
| -rw-r--r-- | kernel/ksyms.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/kernel/context.c b/kernel/context.c index 6bfaaca920da..9ae4b6010901 100644 --- a/kernel/context.c +++ b/kernel/context.c @@ -101,8 +101,10 @@ static int context_thread(void *dummy) if (signal_pending(curtask)) { while (waitpid(-1, (unsigned int *)0, __WALL|WNOHANG) > 0) ; + spin_lock_irq(&curtask->sigmask_lock); flush_signals(curtask); recalc_sigpending(curtask); + spin_unlock_irq(&curtask->sigmask_lock); } } } diff --git a/kernel/ksyms.c b/kernel/ksyms.c index e5d604dcc4ae..59b730b4a024 100644 --- a/kernel/ksyms.c +++ b/kernel/ksyms.c @@ -146,7 +146,7 @@ EXPORT_SYMBOL(path_init); EXPORT_SYMBOL(path_walk); EXPORT_SYMBOL(path_release); EXPORT_SYMBOL(__user_walk); -EXPORT_SYMBOL(lookup_one); +EXPORT_SYMBOL(lookup_one_len); EXPORT_SYMBOL(lookup_hash); EXPORT_SYMBOL(sys_close); EXPORT_SYMBOL(dcache_lock); @@ -264,6 +264,8 @@ EXPORT_SYMBOL(default_llseek); EXPORT_SYMBOL(dentry_open); EXPORT_SYMBOL(filemap_nopage); EXPORT_SYMBOL(filemap_sync); +EXPORT_SYMBOL(filemap_fdatasync); +EXPORT_SYMBOL(filemap_fdatawait); EXPORT_SYMBOL(lock_page); /* device registration */ |
