diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-21 18:50:49 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-21 18:50:49 -0400 |
commit | 9a64388d83f6ef08dfff405a9d122e3dbcb6bf38 (patch) | |
tree | a77532ce4d6d56be6c6c7f405cd901a0184250fb /arch/powerpc/math-emu/fdivs.c | |
parent | e80ab411e589e00550e2e6e5a6a02d59cc730357 (diff) | |
parent | 14b3ca4022f050f8622ed282b734ddf445464583 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (202 commits)
[POWERPC] Fix compile breakage for 64-bit UP configs
[POWERPC] Define copy_siginfo_from_user32
[POWERPC] Add compat handler for PTRACE_GETSIGINFO
[POWERPC] i2c: Fix build breakage introduced by OF helpers
[POWERPC] Optimize fls64() on 64-bit processors
[POWERPC] irqtrace support for 64-bit powerpc
[POWERPC] Stacktrace support for lockdep
[POWERPC] Move stackframe definitions to common header
[POWERPC] Fix device-tree locking vs. interrupts
[POWERPC] Make pci_bus_to_host()'s struct pci_bus * argument const
[POWERPC] Remove unused __max_memory variable
[POWERPC] Simplify xics direct/lpar irq_host setup
[POWERPC] Use pseries_setup_i8259_cascade() in pseries_mpic_init_IRQ()
[POWERPC] Turn xics_setup_8259_cascade() into a generic pseries_setup_i8259_cascade()
[POWERPC] Move xics_setup_8259_cascade() into platforms/pseries/setup.c
[POWERPC] Use asm-generic/bitops/find.h in bitops.h
[POWERPC] 83xx: mpc8315 - fix USB UTMI Host setup
[POWERPC] 85xx: Fix the size of qe muram for MPC8568E
[POWERPC] 86xx: mpc86xx_hpcn - Temporarily accept old dts node identifier.
[POWERPC] 86xx: mark functions static, other minor cleanups
...
Diffstat (limited to 'arch/powerpc/math-emu/fdivs.c')
-rw-r--r-- | arch/powerpc/math-emu/fdivs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/math-emu/fdivs.c b/arch/powerpc/math-emu/fdivs.c index b971196e3175..24feed689c35 100644 --- a/arch/powerpc/math-emu/fdivs.c +++ b/arch/powerpc/math-emu/fdivs.c | |||
@@ -15,7 +15,7 @@ fdivs(void *frD, void *frA, void *frB) | |||
15 | int ret = 0; | 15 | int ret = 0; |
16 | 16 | ||
17 | #ifdef DEBUG | 17 | #ifdef DEBUG |
18 | printk("%s: %p %p %p\n", __FUNCTION__, frD, frA, frB); | 18 | printk("%s: %p %p %p\n", __func__, frD, frA, frB); |
19 | #endif | 19 | #endif |
20 | 20 | ||
21 | __FP_UNPACK_D(A, frA); | 21 | __FP_UNPACK_D(A, frA); |
@@ -29,13 +29,13 @@ fdivs(void *frD, void *frA, void *frB) | |||
29 | if (A_c == FP_CLS_ZERO && B_c == FP_CLS_ZERO) { | 29 | if (A_c == FP_CLS_ZERO && B_c == FP_CLS_ZERO) { |
30 | ret |= EFLAG_VXZDZ; | 30 | ret |= EFLAG_VXZDZ; |
31 | #ifdef DEBUG | 31 | #ifdef DEBUG |
32 | printk("%s: FPSCR_VXZDZ raised\n", __FUNCTION__); | 32 | printk("%s: FPSCR_VXZDZ raised\n", __func__); |
33 | #endif | 33 | #endif |
34 | } | 34 | } |
35 | if (A_c == FP_CLS_INF && B_c == FP_CLS_INF) { | 35 | if (A_c == FP_CLS_INF && B_c == FP_CLS_INF) { |
36 | ret |= EFLAG_VXIDI; | 36 | ret |= EFLAG_VXIDI; |
37 | #ifdef DEBUG | 37 | #ifdef DEBUG |
38 | printk("%s: FPSCR_VXIDI raised\n", __FUNCTION__); | 38 | printk("%s: FPSCR_VXIDI raised\n", __func__); |
39 | #endif | 39 | #endif |
40 | } | 40 | } |
41 | 41 | ||