git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
oprofile
/
buffer_sync.c
diff --git
a/drivers/oprofile/buffer_sync.c
b/drivers/oprofile/buffer_sync.c
index
a647d39
..
fd8b050
100644
(file)
--- a/
drivers/oprofile/buffer_sync.c
+++ b/
drivers/oprofile/buffer_sync.c
@@
-112,10
+112,10
@@
static int module_load_notify(struct notifier_block * self, unsigned long val, v
return 0;
/* FIXME: should we process all CPU buffers ? */
return 0;
/* FIXME: should we process all CPU buffers ? */
-
down(&buffer_sem
);
+
mutex_lock(&buffer_mutex
);
add_event_entry(ESCAPE_CODE);
add_event_entry(MODULE_LOADED_CODE);
add_event_entry(ESCAPE_CODE);
add_event_entry(MODULE_LOADED_CODE);
-
up(&buffer_sem
);
+
mutex_unlock(&buffer_mutex
);
#endif
return 0;
}
#endif
return 0;
}
@@
-224,8
+224,8
@@
static unsigned long get_exec_dcookie(struct mm_struct * mm)
continue;
if (!(vma->vm_flags & VM_EXECUTABLE))
continue;
continue;
if (!(vma->vm_flags & VM_EXECUTABLE))
continue;
- cookie = fast_get_dcookie(vma->vm_file->f_dentry,
- vma->vm_file->f_
vfs
mnt);
+ cookie = fast_get_dcookie(vma->vm_file->f_
path.
dentry,
+ vma->vm_file->f_
path.
mnt);
break;
}
break;
}
@@
-250,8
+250,8
@@
static unsigned long lookup_dcookie(struct mm_struct * mm, unsigned long addr, o
continue;
if (vma->vm_file) {
continue;
if (vma->vm_file) {
- cookie = fast_get_dcookie(vma->vm_file->f_dentry,
- vma->vm_file->f_
vfs
mnt);
+ cookie = fast_get_dcookie(vma->vm_file->f_
path.
dentry,
+ vma->vm_file->f_
path.
mnt);
*offset = (vma->vm_pgoff << PAGE_SHIFT) + addr -
vma->vm_start;
} else {
*offset = (vma->vm_pgoff << PAGE_SHIFT) + addr -
vma->vm_start;
} else {
@@
-522,7
+522,7
@@
void sync_buffer(int cpu)
unsigned long available;
int domain_switch = 0;
unsigned long available;
int domain_switch = 0;
-
down(&buffer_sem
);
+
mutex_lock(&buffer_mutex
);
add_cpu_switch(cpu);
add_cpu_switch(cpu);
@@
-578,5
+578,5
@@
void sync_buffer(int cpu)
mark_done(cpu);
mark_done(cpu);
-
up(&buffer_sem
);
+
mutex_unlock(&buffer_mutex
);
}
}