diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-19 19:13:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-19 19:13:49 -0800 |
| commit | 11743a1db9956a024b9b75292614e9869abb9ec2 (patch) | |
| tree | c0593947a2c4b0e9e1bf1327548eb32feb45cacb /arch/x86/um | |
| parent | 121027a7a64a12e9e5c0289f12473ff11678a812 (diff) | |
| parent | 19348e749e9515c429f5d561d2f2c724862a4bee (diff) | |
Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 cleanup patches from Ingo Molnar:
"Misc smaller cleanups"
* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86: ptrace.c only needs export.h and not the full module.h
x86, apb_timer: remove unused variable percpu_timer
um: don't compare a pointer to 0
arch/x86/platform/uv: use ARRAY_SIZE where possible
Diffstat (limited to 'arch/x86/um')
| -rw-r--r-- | arch/x86/um/fault.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/um/fault.c b/arch/x86/um/fault.c index 8784ab30d91b..84ac7f7b0257 100644 --- a/arch/x86/um/fault.c +++ b/arch/x86/um/fault.c @@ -20,7 +20,7 @@ int arch_fixup(unsigned long address, struct uml_pt_regs *regs) const struct exception_table_entry *fixup; fixup = search_exception_tables(address); - if (fixup != 0) { + if (fixup) { UPT_IP(regs) = fixup->fixup; return 1; } |