diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-02 00:08:05 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-02 00:08:05 -0500 |
| commit | 95d465fd750897ab32462a6702fbfe1b122cbbc0 (patch) | |
| tree | 65c38b2f11c51bb6932e44dd6c92f15b0091abfe /arch/ppc/math-emu/fsqrt.c | |
| parent | 642fde17dceceb56c7ba2762733ac688666ae657 (diff) | |
| parent | 683aa4012f53b2ada0f430487e05d37b0d94e90a (diff) | |
| download | talos-obmc-linux-95d465fd750897ab32462a6702fbfe1b122cbbc0.tar.gz talos-obmc-linux-95d465fd750897ab32462a6702fbfe1b122cbbc0.zip | |
Manual merge with Linus.
Conflicts:
arch/powerpc/kernel/setup-common.c
drivers/input/keyboard/hil_kbd.c
drivers/input/mouse/hil_ptr.c
Diffstat (limited to 'arch/ppc/math-emu/fsqrt.c')
| -rw-r--r-- | arch/ppc/math-emu/fsqrt.c | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/arch/ppc/math-emu/fsqrt.c b/arch/ppc/math-emu/fsqrt.c deleted file mode 100644 index 6f8319f64a8a..000000000000 --- a/arch/ppc/math-emu/fsqrt.c +++ /dev/null @@ -1,37 +0,0 @@ -#include <linux/types.h> -#include <linux/errno.h> -#include <asm/uaccess.h> - -#include "soft-fp.h" -#include "double.h" - -int -fsqrt(void *frD, void *frB) -{ - FP_DECL_D(B); - FP_DECL_D(R); - int ret = 0; - -#ifdef DEBUG - printk("%s: %p %p %p %p\n", __FUNCTION__, frD, frB); -#endif - - __FP_UNPACK_D(B, frB); - -#ifdef DEBUG - printk("B: %ld %lu %lu %ld (%ld)\n", B_s, B_f1, B_f0, B_e, B_c); -#endif - - if (B_s && B_c != FP_CLS_ZERO) - ret |= EFLAG_VXSQRT; - if (B_c == FP_CLS_NAN) - ret |= EFLAG_VXSNAN; - - FP_SQRT_D(R, B); - -#ifdef DEBUG - printk("R: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c); -#endif - - return (ret | __FP_PACK_D(frD, R)); -} |
