projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild
[powerpc.git]
/
fs
/
reiserfs
/
fix_node.c
diff --git
a/fs/reiserfs/fix_node.c
b/fs/reiserfs/fix_node.c
index
2706e2a
..
4582988
100644
(file)
--- a/
fs/reiserfs/fix_node.c
+++ b/
fs/reiserfs/fix_node.c
@@
-2022,7
+2022,7
@@
static int get_neighbors(struct tree_balance *p_s_tb, int n_h)
}
#ifdef CONFIG_REISERFS_CHECK
}
#ifdef CONFIG_REISERFS_CHECK
-void *reiserfs_kmalloc(size_t size,
in
t flags, struct super_block *s)
+void *reiserfs_kmalloc(size_t size,
gfp_
t flags, struct super_block *s)
{
void *vp;
static size_t malloced;
{
void *vp;
static size_t malloced;