diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-22 20:05:19 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-22 20:05:19 +0100 |
| commit | 455750bb34007daa8818005989596a64b9369bb9 (patch) | |
| tree | cde7dca7d0d9364f3042bc709e8508b3cd4a4295 | |
| parent | ced91f4e1addc0ab3d00cbc36af7e4a071b3322b (diff) | |
| parent | eccd4ec34ac5e03d56c6a1bcf86f3b3182b2a460 (diff) | |
| download | linux-crypto-455750bb34007daa8818005989596a64b9369bb9.tar.gz linux-crypto-455750bb34007daa8818005989596a64b9369bb9.zip | |
Merge branch 'linus' into x86/apic
Conflicts:
arch/x86/mach-default/setup.c
Semantic conflict resolution:
arch/x86/kernel/setup.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | crypto/lrw.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/crypto/lrw.c b/crypto/lrw.c index 8ef664e3..358f80be 100644 --- a/crypto/lrw.c +++ b/crypto/lrw.c @@ -45,7 +45,13 @@ struct priv { static inline void setbit128_bbe(void *b, int bit) { - __set_bit(bit ^ 0x78, b); + __set_bit(bit ^ (0x80 - +#ifdef __BIG_ENDIAN + BITS_PER_LONG +#else + BITS_PER_BYTE +#endif + ), b); } static int setkey(struct crypto_tfm *parent, const u8 *key, |