diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-10 19:42:48 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-10 19:42:48 -0500 |
commit | 40ba587923ae67090d9f141c1d3c951be5c1420e (patch) | |
tree | 342a72fc0ee13a0d2496ef970b64dfeadf1355d2 /lib | |
parent | 54c2c5761febcca46c8037d3a81612991e6c209a (diff) | |
parent | 6b550f9495947fc279d12c38feaf98500e8d0646 (diff) |
Merge branch 'akpm' (aka "Andrew's patch-bomb")
Andrew elucidates:
- First installmeant of MM. We have a HUGE number of MM patches this
time. It's crazy.
- MAINTAINERS updates
- backlight updates
- leds
- checkpatch updates
- misc ELF stuff
- rtc updates
- reiserfs
- procfs
- some misc other bits
* akpm: (124 commits)
user namespace: make signal.c respect user namespaces
workqueue: make alloc_workqueue() take printf fmt and args for name
procfs: add hidepid= and gid= mount options
procfs: parse mount options
procfs: introduce the /proc/<pid>/map_files/ directory
procfs: make proc_get_link to use dentry instead of inode
signal: add block_sigmask() for adding sigmask to current->blocked
sparc: make SA_NOMASK a synonym of SA_NODEFER
reiserfs: don't lock root inode searching
reiserfs: don't lock journal_init()
reiserfs: delay reiserfs lock until journal initialization
reiserfs: delete comments referring to the BKL
drivers/rtc/interface.c: fix alarm rollover when day or month is out-of-range
drivers/rtc/rtc-twl.c: add DT support for RTC inside twl4030/twl6030
drivers/rtc/: remove redundant spi driver bus initialization
drivers/rtc/rtc-jz4740.c: make jz4740_rtc_driver static
drivers/rtc/rtc-mc13xxx.c: make mc13xxx_rtc_idtable static
rtc: convert drivers/rtc/* to use module_platform_driver()
drivers/rtc/rtc-wm831x.c: convert to devm_kzalloc()
drivers/rtc/rtc-wm831x.c: remove unused period IRQ handler
...
Diffstat (limited to 'lib')
-rw-r--r-- | lib/btree.c | 1 | ||||
-rw-r--r-- | lib/crc32.c | 21 |
2 files changed, 12 insertions, 10 deletions
diff --git a/lib/btree.c b/lib/btree.c index 2a34392bcecc..e5ec1e9c1aa5 100644 --- a/lib/btree.c +++ b/lib/btree.c | |||
@@ -357,6 +357,7 @@ miss: | |||
357 | } | 357 | } |
358 | return NULL; | 358 | return NULL; |
359 | } | 359 | } |
360 | EXPORT_SYMBOL_GPL(btree_get_prev); | ||
360 | 361 | ||
361 | static int getpos(struct btree_geo *geo, unsigned long *node, | 362 | static int getpos(struct btree_geo *geo, unsigned long *node, |
362 | unsigned long *key) | 363 | unsigned long *key) |
diff --git a/lib/crc32.c b/lib/crc32.c index a6e633a48cea..4b35d2b4437c 100644 --- a/lib/crc32.c +++ b/lib/crc32.c | |||
@@ -51,20 +51,21 @@ static inline u32 | |||
51 | crc32_body(u32 crc, unsigned char const *buf, size_t len, const u32 (*tab)[256]) | 51 | crc32_body(u32 crc, unsigned char const *buf, size_t len, const u32 (*tab)[256]) |
52 | { | 52 | { |
53 | # ifdef __LITTLE_ENDIAN | 53 | # ifdef __LITTLE_ENDIAN |
54 | # define DO_CRC(x) crc = tab[0][(crc ^ (x)) & 255] ^ (crc >> 8) | 54 | # define DO_CRC(x) crc = t0[(crc ^ (x)) & 255] ^ (crc >> 8) |
55 | # define DO_CRC4 crc = tab[3][(crc) & 255] ^ \ | 55 | # define DO_CRC4 crc = t3[(crc) & 255] ^ \ |
56 | tab[2][(crc >> 8) & 255] ^ \ | 56 | t2[(crc >> 8) & 255] ^ \ |
57 | tab[1][(crc >> 16) & 255] ^ \ | 57 | t1[(crc >> 16) & 255] ^ \ |
58 | tab[0][(crc >> 24) & 255] | 58 | t0[(crc >> 24) & 255] |
59 | # else | 59 | # else |
60 | # define DO_CRC(x) crc = tab[0][((crc >> 24) ^ (x)) & 255] ^ (crc << 8) | 60 | # define DO_CRC(x) crc = t0[((crc >> 24) ^ (x)) & 255] ^ (crc << 8) |
61 | # define DO_CRC4 crc = tab[0][(crc) & 255] ^ \ | 61 | # define DO_CRC4 crc = t0[(crc) & 255] ^ \ |
62 | tab[1][(crc >> 8) & 255] ^ \ | 62 | t1[(crc >> 8) & 255] ^ \ |
63 | tab[2][(crc >> 16) & 255] ^ \ | 63 | t2[(crc >> 16) & 255] ^ \ |
64 | tab[3][(crc >> 24) & 255] | 64 | t3[(crc >> 24) & 255] |
65 | # endif | 65 | # endif |
66 | const u32 *b; | 66 | const u32 *b; |
67 | size_t rem_len; | 67 | size_t rem_len; |
68 | const u32 *t0=tab[0], *t1=tab[1], *t2=tab[2], *t3=tab[3]; | ||
68 | 69 | ||
69 | /* Align it */ | 70 | /* Align it */ |
70 | if (unlikely((long)buf & 3 && len)) { | 71 | if (unlikely((long)buf & 3 && len)) { |