projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'amba', 'devel-stable', 'kexec-for-next' and 'misc' into for-linus
[cascardo/linux.git]
/
drivers
/
oprofile
/
oprofilefs.c
diff --git
a/drivers/oprofile/oprofilefs.c
b/drivers/oprofile/oprofilefs.c
index
b48ac63
..
a0e5260
100644
(file)
--- a/
drivers/oprofile/oprofilefs.c
+++ b/
drivers/oprofile/oprofilefs.c
@@
-239,8
+239,8
@@
static int oprofilefs_fill_super(struct super_block *sb, void *data, int silent)
{
struct inode *root_inode;
- sb->s_blocksize = PAGE_
CACHE_
SIZE;
- sb->s_blocksize_bits = PAGE_
CACHE_
SHIFT;
+ sb->s_blocksize = PAGE_SIZE;
+ sb->s_blocksize_bits = PAGE_SHIFT;
sb->s_magic = OPROFILEFS_MAGIC;
sb->s_op = &s_ops;
sb->s_time_gran = 1;