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 'master' of git://git.kernel.org/pub/scm/fs/xfs/xfs
[pandora-kernel.git]
/
arch
/
s390
/
kernel
/
debug.c
diff --git
a/arch/s390/kernel/debug.c
b/arch/s390/kernel/debug.c
index
ba03fc0
..
be8bcea
100644
(file)
--- a/
arch/s390/kernel/debug.c
+++ b/
arch/s390/kernel/debug.c
@@
-603,7
+603,7
@@
debug_input(struct file *file, const char __user *user_buf, size_t length,
static int
debug_open(struct inode *inode, struct file *file)
{
static int
debug_open(struct inode *inode, struct file *file)
{
- int i
= 0
, rc = 0;
+ int i, rc = 0;
file_private_info_t *p_info;
debug_info_t *debug_info, *debug_info_snapshot;
file_private_info_t *p_info;
debug_info_t *debug_info, *debug_info_snapshot;
@@
-642,8
+642,7
@@
found:
p_info = kmalloc(sizeof(file_private_info_t),
GFP_KERNEL);
if(!p_info){
p_info = kmalloc(sizeof(file_private_info_t),
GFP_KERNEL);
if(!p_info){
- if(debug_info_snapshot)
- debug_info_free(debug_info_snapshot);
+ debug_info_free(debug_info_snapshot);
rc = -ENOMEM;
goto out;
}
rc = -ENOMEM;
goto out;
}
@@
-698,8
+697,7
@@
debug_info_t *debug_register_mode(const char *name, int pages_per_area,
if ((uid != 0) || (gid != 0))
pr_warning("Root becomes the owner of all s390dbf files "
"in sysfs\n");
if ((uid != 0) || (gid != 0))
pr_warning("Root becomes the owner of all s390dbf files "
"in sysfs\n");
- if (!initialized)
- BUG();
+ BUG_ON(!initialized);
mutex_lock(&debug_mutex);
/* create new debug_info */
mutex_lock(&debug_mutex);
/* create new debug_info */
@@
-1156,7
+1154,6
@@
debug_unregister_view(debug_info_t * id, struct debug_view *view)
else {
debugfs_remove(id->debugfs_entries[i]);
id->views[i] = NULL;
else {
debugfs_remove(id->debugfs_entries[i]);
id->views[i] = NULL;
- rc = 0;
}
spin_unlock_irqrestore(&id->lock, flags);
out:
}
spin_unlock_irqrestore(&id->lock, flags);
out: