diff options
| author | Linus Torvalds | 2006-07-29 04:24:38 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2006-07-29 04:24:38 +0200 |
| commit | 9d22e6d7ad50472da399a500bf039e7718a6cdc9 (patch) | |
| tree | e3b69a31ca755d33ec86e52bbac5e883c59d6daf /include | |
| parent | Merge git://oss.sgi.com:8090/nathans/xfs-rc-2.6 (diff) | |
| parent | [SUNLANCE]: fix compilation on sparc-UP (diff) | |
| download | kernel-qcow2-linux-9d22e6d7ad50472da399a500bf039e7718a6cdc9.tar.gz kernel-qcow2-linux-9d22e6d7ad50472da399a500bf039e7718a6cdc9.tar.xz kernel-qcow2-linux-9d22e6d7ad50472da399a500bf039e7718a6cdc9.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SUNLANCE]: fix compilation on sparc-UP
[SPARC]: Defer clock_probe to fs_initcall()
[SPARC64]: Fix typo in pgprot_noncached().
[SPARC64]: Fix quad-float multiply emulation.
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-sparc64/pgtable.h | 2 | ||||
| -rw-r--r-- | include/asm-sparc64/sfp-machine.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-sparc64/pgtable.h b/include/asm-sparc64/pgtable.h index 03f5bc9b6bec..1ba19eb34ce3 100644 --- a/include/asm-sparc64/pgtable.h +++ b/include/asm-sparc64/pgtable.h @@ -339,7 +339,7 @@ static inline pgprot_t pgprot_noncached(pgprot_t prot) " .section .sun4v_2insn_patch, \"ax\"\n" " .word 661b\n" " andn %0, %4, %0\n" - " or %0, %3, %0\n" + " or %0, %5, %0\n" " .previous\n" : "=r" (val) : "0" (val), "i" (_PAGE_CP_4U | _PAGE_CV_4U), "i" (_PAGE_E_4U), diff --git a/include/asm-sparc64/sfp-machine.h b/include/asm-sparc64/sfp-machine.h index 5015bb8d6c32..89d42431efb5 100644 --- a/include/asm-sparc64/sfp-machine.h +++ b/include/asm-sparc64/sfp-machine.h @@ -34,7 +34,7 @@ #define _FP_MUL_MEAT_D(R,X,Y) \ _FP_MUL_MEAT_1_wide(_FP_WFRACBITS_D,R,X,Y,umul_ppmm) #define _FP_MUL_MEAT_Q(R,X,Y) \ - _FP_MUL_MEAT_2_wide_3mul(_FP_WFRACBITS_Q,R,X,Y,umul_ppmm) + _FP_MUL_MEAT_2_wide(_FP_WFRACBITS_Q,R,X,Y,umul_ppmm) #define _FP_DIV_MEAT_S(R,X,Y) _FP_DIV_MEAT_1_imm(S,R,X,Y,_FP_DIV_HELP_imm) #define _FP_DIV_MEAT_D(R,X,Y) _FP_DIV_MEAT_1_udiv_norm(D,R,X,Y) |