git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
microblaze: fix __get_user()
[pandora-kernel.git]
/
include
/
linux
/
jhash.h
diff --git
a/include/linux/jhash.h
b/include/linux/jhash.h
index
47cb09e
..
348c6f4
100644
(file)
--- a/
include/linux/jhash.h
+++ b/
include/linux/jhash.h
@@
-145,11
+145,11
@@
static inline u32 jhash2(const u32 *k, u32 length, u32 initval)
}
}
-/*
jhash_3
words - hash exactly 3, 2 or 1 word(s) */
-static inline u32
jhash_3
words(u32 a, u32 b, u32 c, u32 initval)
+/*
__jhash_n
words - hash exactly 3, 2 or 1 word(s) */
+static inline u32
__jhash_n
words(u32 a, u32 b, u32 c, u32 initval)
{
{
- a +=
JHASH_INITVAL
;
- b +=
JHASH_INITVAL
;
+ a +=
initval
;
+ b +=
initval
;
c += initval;
__jhash_final(a, b, c);
c += initval;
__jhash_final(a, b, c);
@@
-157,14
+157,19
@@
static inline u32 jhash_3words(u32 a, u32 b, u32 c, u32 initval)
return c;
}
return c;
}
+static inline u32 jhash_3words(u32 a, u32 b, u32 c, u32 initval)
+{
+ return __jhash_nwords(a, b, c, initval + JHASH_INITVAL + (3 << 2));
+}
+
static inline u32 jhash_2words(u32 a, u32 b, u32 initval)
{
static inline u32 jhash_2words(u32 a, u32 b, u32 initval)
{
- return
jhash_3words(a, b, 0, initval
);
+ return
__jhash_nwords(a, b, 0, initval + JHASH_INITVAL + (2 << 2)
);
}
static inline u32 jhash_1word(u32 a, u32 initval)
{
}
static inline u32 jhash_1word(u32 a, u32 initval)
{
- return
jhash_3words(a, 0, 0, initval
);
+ return
__jhash_nwords(a, 0, 0, initval + JHASH_INITVAL + (1 << 2)
);
}
#endif /* _LINUX_JHASH_H */
}
#endif /* _LINUX_JHASH_H */