diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2009-01-14 08:29:51 +0300 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2009-01-14 08:29:51 +0300 |
| commit | cb7a97d01521797cad9f63e8478403c3e51fea49 (patch) | |
| tree | 84cddf20369f82f10c1c3712e6cce20dd1b9d863 /drivers/oprofile/event_buffer.c | |
| parent | 0335cb76aa3fa913a2164bc9b669e5aef9d56fa3 (diff) | |
| parent | a6525042bfdfcab128bd91fad264de10fd24a55e (diff) | |
| download | linux-cb7a97d01521797cad9f63e8478403c3e51fea49.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'drivers/oprofile/event_buffer.c')
| -rw-r--r-- | drivers/oprofile/event_buffer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/oprofile/event_buffer.c b/drivers/oprofile/event_buffer.c index 191a3202cecc..2b7ae366ceb1 100644 --- a/drivers/oprofile/event_buffer.c +++ b/drivers/oprofile/event_buffer.c @@ -73,8 +73,8 @@ int alloc_event_buffer(void) unsigned long flags; spin_lock_irqsave(&oprofilefs_lock, flags); - buffer_size = fs_buffer_size; - buffer_watershed = fs_buffer_watershed; + buffer_size = oprofile_buffer_size; + buffer_watershed = oprofile_buffer_watershed; spin_unlock_irqrestore(&oprofilefs_lock, flags); if (buffer_watershed >= buffer_size) |