diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-12 23:15:27 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-12 23:15:27 +0000 |
| commit | ae38fd1e4c98588314a42097c5a5e77dcef23561 (patch) | |
| tree | f9f10c203bb9e5fbad4810d1f8774c08dfad20ff /kernel | |
| parent | 466a823d79f41d0713b272e48fd73e494b0588e0 (diff) | |
Merge with Linux 2.3.50.
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/ksyms.c | 8 | ||||
| -rw-r--r-- | kernel/softirq.c | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/kernel/ksyms.c b/kernel/ksyms.c index 82ee62980..45594e6af 100644 --- a/kernel/ksyms.c +++ b/kernel/ksyms.c @@ -182,6 +182,7 @@ EXPORT_SYMBOL(notify_change); EXPORT_SYMBOL(get_hardblocksize); EXPORT_SYMBOL(set_blocksize); EXPORT_SYMBOL(getblk); +EXPORT_SYMBOL(bdget); EXPORT_SYMBOL(bread); EXPORT_SYMBOL(breada); EXPORT_SYMBOL(__brelse); @@ -217,6 +218,11 @@ EXPORT_SYMBOL(shrink_dcache_parent); EXPORT_SYMBOL(find_inode_number); EXPORT_SYMBOL(is_subdir); EXPORT_SYMBOL(get_unused_fd); +EXPORT_SYMBOL(vfs_create); +EXPORT_SYMBOL(vfs_mkdir); +EXPORT_SYMBOL(vfs_mknod); +EXPORT_SYMBOL(vfs_symlink); +EXPORT_SYMBOL(vfs_link); EXPORT_SYMBOL(vfs_rmdir); EXPORT_SYMBOL(vfs_unlink); EXPORT_SYMBOL(vfs_rename); @@ -233,6 +239,7 @@ EXPORT_SYMBOL(page_readlink); EXPORT_SYMBOL(page_follow_link); EXPORT_SYMBOL(page_symlink_inode_operations); EXPORT_SYMBOL(block_symlink); +EXPORT_SYMBOL(vfs_readdir); /* for stackable file systems (lofs, wrapfs, etc.) */ EXPORT_SYMBOL(add_to_page_cache); @@ -368,6 +375,7 @@ EXPORT_SYMBOL(enable_hlt); EXPORT_SYMBOL(request_resource); EXPORT_SYMBOL(release_resource); EXPORT_SYMBOL(allocate_resource); +EXPORT_SYMBOL(check_resource); EXPORT_SYMBOL(__request_region); EXPORT_SYMBOL(__check_region); EXPORT_SYMBOL(__release_region); diff --git a/kernel/softirq.c b/kernel/softirq.c index 0f3c23ee9..e8afe0919 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c @@ -204,6 +204,7 @@ void tasklet_kill(struct tasklet_struct *t) schedule(); } tasklet_unlock_wait(t); + clear_bit(TASKLET_STATE_SCHED, &t->state); } |