summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@home.transmeta.com>2002-05-22 20:30:40 -0700
committerLinus Torvalds <torvalds@home.transmeta.com>2002-05-22 20:30:40 -0700
commitbf3493c982adac61a2f2ed6bbfec2674dcbe96b4 (patch)
treeabe7cda3221c12774e8eafcb395a99e68feb8ec1 /include
parent0906b7e6964560f5d9d2d76365433dbcd591b539 (diff)
parent19f385b0d1417730675a7ea30efce33e53091a7a (diff)
Merge master.kernel.org:/home/davem/BK/sparc-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include')
-rw-r--r--include/asm-sparc64/bitops.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/asm-sparc64/bitops.h b/include/asm-sparc64/bitops.h
index 40af670f7eef..1af0f9dc47f7 100644
--- a/include/asm-sparc64/bitops.h
+++ b/include/asm-sparc64/bitops.h
@@ -112,6 +112,12 @@ static __inline__ unsigned long __ffs(unsigned long word)
return result;
}
+/*
+ * fls: find last bit set.
+ */
+
+#define fls(x) generic_fls(x)
+
#ifdef __KERNEL__
/*