git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
[pandora-kernel.git]
/
fs
/
namespace.c
diff --git
a/fs/namespace.c
b/fs/namespace.c
index
061e5ed
..
4fc302c
100644
(file)
--- a/
fs/namespace.c
+++ b/
fs/namespace.c
@@
-2329,10
+2329,10
@@
void __init mnt_init(void)
err = sysfs_init();
if (err)
printk(KERN_WARNING "%s: sysfs_init error: %d\n",
err = sysfs_init();
if (err)
printk(KERN_WARNING "%s: sysfs_init error: %d\n",
- __
FUNCTION
__, err);
+ __
func
__, err);
fs_kobj = kobject_create_and_add("fs", NULL);
if (!fs_kobj)
fs_kobj = kobject_create_and_add("fs", NULL);
if (!fs_kobj)
- printk(KERN_WARNING "%s: kobj create error\n", __
FUNCTION
__);
+ printk(KERN_WARNING "%s: kobj create error\n", __
func
__);
init_rootfs();
init_mount_tree();
}
init_rootfs();
init_mount_tree();
}