diff options
| author | Robert Richter <robert.richter@amd.com> | 2009-01-08 14:27:34 +0100 |
|---|---|---|
| committer | Robert Richter <robert.richter@amd.com> | 2009-01-08 14:27:34 +0100 |
| commit | d2852b932f0bb5e89177aa27c7bcf07f4167e129 (patch) | |
| tree | 96d975ae155ba307acd07968939fff22afedddf7 /drivers/oprofile/event_buffer.c | |
| parent | 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 (diff) | |
| parent | 14f0ca8eaea42a5b5a69cfcb699665dd2618db5f (diff) | |
Merge branch 'oprofile/ring_buffer' into oprofile/oprofile-for-tip
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) |