Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 295220
b: refs/heads/master
c: ce4320d
h: refs/heads/master
v: v3
  • Loading branch information
Bob Pearson authored and Linus Torvalds committed Mar 23, 2012
1 parent 582e413 commit f2caa62
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 60e58d5c9d8d698600e8ccb44b5a13cf99d0d90f
refs/heads/master: ce4320ddda4c2520fe77194d3c801ad4e8a8aa11
12 changes: 6 additions & 6 deletions trunk/lib/crc32.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@
#include "crc32defs.h"

#if CRC_LE_BITS == 8
# define tole(x) __constant_cpu_to_le32(x)
# define tole(x) ((__force u32) __constant_cpu_to_le32(x))
#else
# define tole(x) (x)
#endif

#if CRC_BE_BITS == 8
# define tobe(x) __constant_cpu_to_be32(x)
# define tobe(x) ((__force u32) __constant_cpu_to_be32(x))
#else
# define tobe(x) (x)
#endif
Expand Down Expand Up @@ -128,9 +128,9 @@ u32 __pure crc32_le(u32 crc, unsigned char const *p, size_t len)
# elif CRC_LE_BITS == 8
const u32 (*tab)[] = crc32table_le;

crc = __cpu_to_le32(crc);
crc = (__force u32) __cpu_to_le32(crc);
crc = crc32_body(crc, p, len, tab);
crc = __le32_to_cpu(crc);
crc = __le32_to_cpu((__force __le32)crc);
#endif
return crc;
}
Expand Down Expand Up @@ -171,9 +171,9 @@ u32 __pure crc32_be(u32 crc, unsigned char const *p, size_t len)
# elif CRC_BE_BITS == 8
const u32 (*tab)[] = crc32table_be;

crc = __cpu_to_be32(crc);
crc = (__force u32) __cpu_to_be32(crc);
crc = crc32_body(crc, p, len, tab);
crc = __be32_to_cpu(crc);
crc = __be32_to_cpu((__force __be32)crc);
# endif
return crc;
}
Expand Down

0 comments on commit f2caa62

Please sign in to comment.