diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-07 15:14:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-07 15:14:53 -0700 |
| commit | 292088ee032d0df59e7c8a7a00e9b97260146078 (patch) | |
| tree | 99e5eee404285d4e2b6d282113cccee58236580f /arch/cris/kernel/profile.c | |
| parent | bc2d968f0ec698c66750e0ad1c1d35568fe93c05 (diff) | |
| parent | 254844d3b9959b52fedf2f22810cc66e82a1ca16 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull more vfs updates from Al Viro:
"A couple of fixes + getting rid of __blkdev_put() return value"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
proc: Use PDE attribute setting accessor functions
make blkdev_put() return void
block_device_operations->release() should return void
mtd_blktrans_ops->release() should return void
hfs: SMP race on directory close()
Diffstat (limited to 'arch/cris/kernel/profile.c')
| -rw-r--r-- | arch/cris/kernel/profile.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/kernel/profile.c b/arch/cris/kernel/profile.c index b82e08615d1b..cd9f15b92f8f 100644 --- a/arch/cris/kernel/profile.c +++ b/arch/cris/kernel/profile.c @@ -76,7 +76,7 @@ static int __init init_cris_profile(void) entry = proc_create("system_profile", S_IWUSR | S_IRUGO, NULL, &cris_proc_profile_operations); if (entry) { - entry->size = SAMPLE_BUFFER_SIZE; + proc_set_size(entry, SAMPLE_BUFFER_SIZE); } prof_running = 1; |