diff options
author | John W. Linville <linville@tuxdriver.com> | 2012-09-07 21:07:55 +0200 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-09-07 21:07:55 +0200 |
commit | fac805f8c198092de9a2842efd7f5022e2937b18 (patch) | |
tree | 7557809c373f97a343c427d8fded0696060394ce /arch/s390/oprofile | |
parent | rtlwifi: Update header file (diff) | |
parent | libertas sdio: fix suspend when interface is down (diff) | |
download | linux-fac805f8c198092de9a2842efd7f5022e2937b18.tar.xz linux-fac805f8c198092de9a2842efd7f5022e2937b18.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'arch/s390/oprofile')
-rw-r--r-- | arch/s390/oprofile/backtrace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/oprofile/backtrace.c b/arch/s390/oprofile/backtrace.c index c82f62fb9c28..8a6811b2cdb9 100644 --- a/arch/s390/oprofile/backtrace.c +++ b/arch/s390/oprofile/backtrace.c @@ -58,7 +58,7 @@ void s390_backtrace(struct pt_regs * const regs, unsigned int depth) unsigned long head; struct stack_frame* head_sf; - if (user_mode (regs)) + if (user_mode(regs)) return; head = regs->gprs[15]; |