diff options
| -rw-r--r-- | fs/namespace.c | 8 | ||||
| -rw-r--r-- | kernel/futex.c | 1 | ||||
| -rw-r--r-- | sound/core/seq/seq_clientmgr.c | 2 | ||||
| -rw-r--r-- | sound/core/seq/seq_queue.c | 6 | ||||
| -rw-r--r-- | sound/pci/ac97/ac97_codec.c | 4 |
5 files changed, 9 insertions, 12 deletions
diff --git a/fs/namespace.c b/fs/namespace.c index e39775cbd531..7efb2700bd47 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -22,16 +22,14 @@ #include <asm/uaccess.h> -struct vfsmount *do_kern_mount(const char *type, int flags, char *name, void *data); -int do_remount_sb(struct super_block *sb, int flags, void * data); -int __init init_rootfs(void); +extern struct vfsmount *do_kern_mount(const char *type, int flags, char *name, void *data); +extern int do_remount_sb(struct super_block *sb, int flags, void * data); +extern int __init init_rootfs(void); static struct list_head *mount_hashtable; static int hash_mask, hash_bits; static kmem_cache_t *mnt_cache; -extern void init_rootfs(void); - static inline unsigned long hash(struct vfsmount *mnt, struct dentry *dentry) { unsigned long tmp = ((unsigned long) mnt / L1_CACHE_BYTES); diff --git a/kernel/futex.c b/kernel/futex.c index ce5e9f6ed3bc..36c693bd1e23 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -388,7 +388,6 @@ static struct file_system_type futex_fs_type = { name: "futexfs", get_sb: futexfs_get_sb, kill_sb: kill_anon_super, - fs_flags: FS_NOMOUNT, }; static int __init init(void) diff --git a/sound/core/seq/seq_clientmgr.c b/sound/core/seq/seq_clientmgr.c index 7a92f799d628..a9389629fb5f 100644 --- a/sound/core/seq/seq_clientmgr.c +++ b/sound/core/seq/seq_clientmgr.c @@ -469,7 +469,7 @@ static client_t *get_event_dest_client(snd_seq_event_t *event, int filter) if (! dest->accept_input) goto __not_avail; if ((dest->filter & SNDRV_SEQ_FILTER_USE_EVENT) && - ! test_bit(event->type, &dest->event_filter)) + ! test_bit(event->type, dest->event_filter)) goto __not_avail; if (filter && !(dest->filter & filter)) goto __not_avail; diff --git a/sound/core/seq/seq_queue.c b/sound/core/seq/seq_queue.c index 7cd9beb91909..a3c7bb213553 100644 --- a/sound/core/seq/seq_queue.c +++ b/sound/core/seq/seq_queue.c @@ -544,10 +544,10 @@ int snd_seq_queue_use(int queueid, int client, int use) return -EINVAL; down(&queue->timer_mutex); if (use) { - if (!test_and_set_bit(client, &queue->clients_bitmap)) + if (!test_and_set_bit(client, queue->clients_bitmap)) queue->clients++; } else { - if (test_and_clear_bit(client, &queue->clients_bitmap)) + if (test_and_clear_bit(client, queue->clients_bitmap)) queue->clients--; } if (queue->clients) { @@ -575,7 +575,7 @@ int snd_seq_queue_is_used(int queueid, int client) q = queueptr(queueid); if (q == NULL) return -EINVAL; /* invalid queue */ - result = test_bit(client, &q->clients_bitmap) ? 1 : 0; + result = test_bit(client, q->clients_bitmap) ? 1 : 0; queuefree(q); return result; } diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c index 597f6f78488a..ca38b0804b02 100644 --- a/sound/pci/ac97/ac97_codec.c +++ b/sound/pci/ac97/ac97_codec.c @@ -265,7 +265,7 @@ void snd_ac97_write_cache(ac97_t *ac97, unsigned short reg, unsigned short value spin_lock(&ac97->reg_lock); ac97->write(ac97, reg, ac97->regs[reg] = value); spin_unlock(&ac97->reg_lock); - set_bit(reg, &ac97->reg_accessed); + set_bit(reg, ac97->reg_accessed); } #ifndef CONFIG_SND_DEBUG @@ -2204,7 +2204,7 @@ void snd_ac97_resume(ac97_t *ac97) * some chip (e.g. nm256) may hang up when unsupported registers * are accessed..! */ - if (test_bit(i, &ac97->reg_accessed)) + if (test_bit(i, ac97->reg_accessed)) snd_ac97_write(ac97, i, ac97->regs[i]); } } |