diff options
author | Michal Marek <mmarek@suse.cz> | 2010-08-04 07:59:13 -0400 |
---|---|---|
committer | Michal Marek <mmarek@suse.cz> | 2010-08-04 07:59:13 -0400 |
commit | 772320e84588dcbe1600ffb83e5f328f2209ac2a (patch) | |
tree | a7de21b79340aeaa17c58126f6b801b82c77b53a /arch/s390/kernel/debug.c | |
parent | 1ce53adf13a54375d2a5c7cdbe341b2558389615 (diff) | |
parent | 9fe6206f400646a2322096b56c59891d530e8d51 (diff) |
Merge commit 'v2.6.35' into kbuild/kbuild
Conflicts:
arch/powerpc/Makefile
Diffstat (limited to 'arch/s390/kernel/debug.c')
-rw-r--r-- | arch/s390/kernel/debug.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/kernel/debug.c b/arch/s390/kernel/debug.c index 0168472b2fdf..98192261491d 100644 --- a/arch/s390/kernel/debug.c +++ b/arch/s390/kernel/debug.c | |||
@@ -655,6 +655,7 @@ found: | |||
655 | p_info->act_entry_offset = 0; | 655 | p_info->act_entry_offset = 0; |
656 | file->private_data = p_info; | 656 | file->private_data = p_info; |
657 | debug_info_get(debug_info); | 657 | debug_info_get(debug_info); |
658 | nonseekable_open(inode, file); | ||
658 | out: | 659 | out: |
659 | mutex_unlock(&debug_mutex); | 660 | mutex_unlock(&debug_mutex); |
660 | return rc; | 661 | return rc; |