projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'topic/fix/misc' and 'topic/fix/hda' into for-linus
[firefly-linux-kernel-4.4.55.git]
/
include
/
linux
/
reiserfs_fs.h
diff --git
a/include/linux/reiserfs_fs.h
b/include/linux/reiserfs_fs.h
index e9963af16cda6ade6ede6dded784c2624f4bc449..bc5114d35e99b65db4e11acefe3bae623a7c9db9 100644
(file)
--- a/
include/linux/reiserfs_fs.h
+++ b/
include/linux/reiserfs_fs.h
@@
-87,7
+87,7
@@
void reiserfs_warning(struct super_block *s, const char *fmt, ...);
if( !( cond ) ) \
reiserfs_panic( NULL, "reiserfs[%i]: assertion " scond " failed at " \
__FILE__ ":%i:%s: " format "\n", \
if( !( cond ) ) \
reiserfs_panic( NULL, "reiserfs[%i]: assertion " scond " failed at " \
__FILE__ ":%i:%s: " format "\n", \
- in_interrupt() ? -1 : task_pid_nr(current), __LINE__ , __
FUNCTION
__ , ##args )
+ in_interrupt() ? -1 : task_pid_nr(current), __LINE__ , __
func
__ , ##args )
#define RASSERT(cond, format, args...) __RASSERT(cond, #cond, format, ##args)
#define RASSERT(cond, format, args...) __RASSERT(cond, #cond, format, ##args)