diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-05 00:40:17 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-05 00:40:17 -0500 |
| commit | 0efcafb0fb7a163999a8821e8a5e7792fca90a2d (patch) | |
| tree | 649d16382e562f595ec55b2aa9ec0d8c5824629b /arch/sparc/include/asm/bitops_32.h | |
| parent | e948990f958c6c41036a99c8a6581e35e7e23d80 (diff) | |
| parent | 410d2c8187ed969238ba98008c1d57307a56cfd8 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: Sync FPU state in VIS emulation handler.
sparc64: Fix VIS emulation bugs
sparc: asm/bitops.h should define __fls
sparc64: Fix bug in PTRACE_SETFPREGS64 handling.
Diffstat (limited to 'arch/sparc/include/asm/bitops_32.h')
| -rw-r--r-- | arch/sparc/include/asm/bitops_32.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sparc/include/asm/bitops_32.h b/arch/sparc/include/asm/bitops_32.h index 68b98a7e6454..9cf4ae0cd7ba 100644 --- a/arch/sparc/include/asm/bitops_32.h +++ b/arch/sparc/include/asm/bitops_32.h | |||
| @@ -98,6 +98,7 @@ static inline void change_bit(unsigned long nr, volatile unsigned long *addr) | |||
| 98 | #include <asm-generic/bitops/sched.h> | 98 | #include <asm-generic/bitops/sched.h> |
| 99 | #include <asm-generic/bitops/ffs.h> | 99 | #include <asm-generic/bitops/ffs.h> |
| 100 | #include <asm-generic/bitops/fls.h> | 100 | #include <asm-generic/bitops/fls.h> |
| 101 | #include <asm-generic/bitops/__fls.h> | ||
| 101 | #include <asm-generic/bitops/fls64.h> | 102 | #include <asm-generic/bitops/fls64.h> |
| 102 | #include <asm-generic/bitops/hweight.h> | 103 | #include <asm-generic/bitops/hweight.h> |
| 103 | #include <asm-generic/bitops/lock.h> | 104 | #include <asm-generic/bitops/lock.h> |