From: Greg Kroah-Hartman Date: Mon, 20 Feb 2012 23:55:09 +0000 (-0800) Subject: Linux 3.0.22 X-Git-Tag: v3.0.22^0 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dcd5ef5f381318f3d4ed80f96730b2d9b6016b7c;p=thirdparty%2Fkernel%2Fstable-queue.git Linux 3.0.22 --- diff --git a/review-3.0/alsa-intel8x0-fix-default-inaudible-sound-on-gateway-m520.patch b/releases/3.0.22/alsa-intel8x0-fix-default-inaudible-sound-on-gateway-m520.patch similarity index 100% rename from review-3.0/alsa-intel8x0-fix-default-inaudible-sound-on-gateway-m520.patch rename to releases/3.0.22/alsa-intel8x0-fix-default-inaudible-sound-on-gateway-m520.patch diff --git a/review-3.0/crypto-sha512-avoid-stack-bloat-on-i386.patch b/releases/3.0.22/crypto-sha512-avoid-stack-bloat-on-i386.patch similarity index 100% rename from review-3.0/crypto-sha512-avoid-stack-bloat-on-i386.patch rename to releases/3.0.22/crypto-sha512-avoid-stack-bloat-on-i386.patch diff --git a/review-3.0/crypto-sha512-use-binary-and-instead-of-modulus.patch b/releases/3.0.22/crypto-sha512-use-binary-and-instead-of-modulus.patch similarity index 100% rename from review-3.0/crypto-sha512-use-binary-and-instead-of-modulus.patch rename to releases/3.0.22/crypto-sha512-use-binary-and-instead-of-modulus.patch diff --git a/releases/3.0.22/crypto-sha512-use-standard-ror64.patch b/releases/3.0.22/crypto-sha512-use-standard-ror64.patch new file mode 100644 index 00000000000..718a86f9f82 --- /dev/null +++ b/releases/3.0.22/crypto-sha512-use-standard-ror64.patch @@ -0,0 +1,86 @@ +From f2ea0f5f04c97b48c88edccba52b0682fbe45087 Mon Sep 17 00:00:00 2001 +From: Alexey Dobriyan +Date: Sat, 14 Jan 2012 21:44:49 +0300 +Subject: crypto: sha512 - use standard ror64() + +From: Alexey Dobriyan + +commit f2ea0f5f04c97b48c88edccba52b0682fbe45087 upstream. + +Use standard ror64() instead of hand-written. +There is no standard ror64, so create it. + +The difference is shift value being "unsigned int" instead of uint64_t +(for which there is no reason). gcc starts to emit native ROR instructions +which it doesn't do for some reason currently. This should make the code +faster. + +Patch survives in-tree crypto test and ping flood with hmac(sha512) on. + +Signed-off-by: Alexey Dobriyan +Signed-off-by: Herbert Xu +Signed-off-by: Greg Kroah-Hartman + +--- + crypto/sha512_generic.c | 13 ++++--------- + include/linux/bitops.h | 20 ++++++++++++++++++++ + 2 files changed, 24 insertions(+), 9 deletions(-) + +--- a/crypto/sha512_generic.c ++++ b/crypto/sha512_generic.c +@@ -31,11 +31,6 @@ static inline u64 Maj(u64 x, u64 y, u64 + return (x & y) | (z & (x | y)); + } + +-static inline u64 RORu64(u64 x, u64 y) +-{ +- return (x >> y) | (x << (64 - y)); +-} +- + static const u64 sha512_K[80] = { + 0x428a2f98d728ae22ULL, 0x7137449123ef65cdULL, 0xb5c0fbcfec4d3b2fULL, + 0xe9b5dba58189dbbcULL, 0x3956c25bf348b538ULL, 0x59f111f1b605d019ULL, +@@ -66,10 +61,10 @@ static const u64 sha512_K[80] = { + 0x5fcb6fab3ad6faecULL, 0x6c44198c4a475817ULL, + }; + +-#define e0(x) (RORu64(x,28) ^ RORu64(x,34) ^ RORu64(x,39)) +-#define e1(x) (RORu64(x,14) ^ RORu64(x,18) ^ RORu64(x,41)) +-#define s0(x) (RORu64(x, 1) ^ RORu64(x, 8) ^ (x >> 7)) +-#define s1(x) (RORu64(x,19) ^ RORu64(x,61) ^ (x >> 6)) ++#define e0(x) (ror64(x,28) ^ ror64(x,34) ^ ror64(x,39)) ++#define e1(x) (ror64(x,14) ^ ror64(x,18) ^ ror64(x,41)) ++#define s0(x) (ror64(x, 1) ^ ror64(x, 8) ^ (x >> 7)) ++#define s1(x) (ror64(x,19) ^ ror64(x,61) ^ (x >> 6)) + + static inline void LOAD_OP(int I, u64 *W, const u8 *input) + { +--- a/include/linux/bitops.h ++++ b/include/linux/bitops.h +@@ -50,6 +50,26 @@ static inline unsigned long hweight_long + } + + /** ++ * rol64 - rotate a 64-bit value left ++ * @word: value to rotate ++ * @shift: bits to roll ++ */ ++static inline __u64 rol64(__u64 word, unsigned int shift) ++{ ++ return (word << shift) | (word >> (64 - shift)); ++} ++ ++/** ++ * ror64 - rotate a 64-bit value right ++ * @word: value to rotate ++ * @shift: bits to roll ++ */ ++static inline __u64 ror64(__u64 word, unsigned int shift) ++{ ++ return (word >> shift) | (word << (64 - shift)); ++} ++ ++/** + * rol32 - rotate a 32-bit value left + * @word: value to rotate + * @shift: bits to roll diff --git a/review-3.0/drm-i915-no-lvds-quirk-for-aopen-mp45.patch b/releases/3.0.22/drm-i915-no-lvds-quirk-for-aopen-mp45.patch similarity index 100% rename from review-3.0/drm-i915-no-lvds-quirk-for-aopen-mp45.patch rename to releases/3.0.22/drm-i915-no-lvds-quirk-for-aopen-mp45.patch diff --git a/review-3.0/gpio-pca953x-fix-warning-of-enabled-interrupts-in-handler.patch b/releases/3.0.22/gpio-pca953x-fix-warning-of-enabled-interrupts-in-handler.patch similarity index 100% rename from review-3.0/gpio-pca953x-fix-warning-of-enabled-interrupts-in-handler.patch rename to releases/3.0.22/gpio-pca953x-fix-warning-of-enabled-interrupts-in-handler.patch diff --git a/review-3.0/hwmon-f75375s-fix-automatic-pwm-mode-setting-for-f75373-f75375.patch b/releases/3.0.22/hwmon-f75375s-fix-automatic-pwm-mode-setting-for-f75373-f75375.patch similarity index 100% rename from review-3.0/hwmon-f75375s-fix-automatic-pwm-mode-setting-for-f75373-f75375.patch rename to releases/3.0.22/hwmon-f75375s-fix-automatic-pwm-mode-setting-for-f75373-f75375.patch diff --git a/review-3.0/hwmon-f75375s-fix-bit-shifting-in-f75375_write16.patch b/releases/3.0.22/hwmon-f75375s-fix-bit-shifting-in-f75375_write16.patch similarity index 100% rename from review-3.0/hwmon-f75375s-fix-bit-shifting-in-f75375_write16.patch rename to releases/3.0.22/hwmon-f75375s-fix-bit-shifting-in-f75375_write16.patch diff --git a/review-3.0/lib-proportion-lower-prop_max_shift-to-32-on-64-bit-kernel.patch b/releases/3.0.22/lib-proportion-lower-prop_max_shift-to-32-on-64-bit-kernel.patch similarity index 100% rename from review-3.0/lib-proportion-lower-prop_max_shift-to-32-on-64-bit-kernel.patch rename to releases/3.0.22/lib-proportion-lower-prop_max_shift-to-32-on-64-bit-kernel.patch diff --git a/review-3.0/mac80211-timeout-a-single-frame-in-the-rx-reorder-buffer.patch b/releases/3.0.22/mac80211-timeout-a-single-frame-in-the-rx-reorder-buffer.patch similarity index 100% rename from review-3.0/mac80211-timeout-a-single-frame-in-the-rx-reorder-buffer.patch rename to releases/3.0.22/mac80211-timeout-a-single-frame-in-the-rx-reorder-buffer.patch diff --git a/review-3.0/perf-evsel-fix-an-issue-where-perf-report-fails-to-show-the-proper-percentage.patch b/releases/3.0.22/perf-evsel-fix-an-issue-where-perf-report-fails-to-show-the-proper-percentage.patch similarity index 100% rename from review-3.0/perf-evsel-fix-an-issue-where-perf-report-fails-to-show-the-proper-percentage.patch rename to releases/3.0.22/perf-evsel-fix-an-issue-where-perf-report-fails-to-show-the-proper-percentage.patch diff --git a/review-3.0/perf-tools-fix-perf-stack-to-non-executable-on-x86_64.patch b/releases/3.0.22/perf-tools-fix-perf-stack-to-non-executable-on-x86_64.patch similarity index 100% rename from review-3.0/perf-tools-fix-perf-stack-to-non-executable-on-x86_64.patch rename to releases/3.0.22/perf-tools-fix-perf-stack-to-non-executable-on-x86_64.patch diff --git a/review-3.0/relay-prevent-integer-overflow-in-relay_open.patch b/releases/3.0.22/relay-prevent-integer-overflow-in-relay_open.patch similarity index 100% rename from review-3.0/relay-prevent-integer-overflow-in-relay_open.patch rename to releases/3.0.22/relay-prevent-integer-overflow-in-relay_open.patch diff --git a/review-3.0/series b/releases/3.0.22/series similarity index 95% rename from review-3.0/series rename to releases/3.0.22/series index 02a830883f0..584137501e8 100644 --- a/review-3.0/series +++ b/releases/3.0.22/series @@ -13,3 +13,4 @@ crypto-sha512-avoid-stack-bloat-on-i386.patch alsa-intel8x0-fix-default-inaudible-sound-on-gateway-m520.patch xen-pvhvm-do-not-remap-pirqs-onto-evtchns-if-xen_have_vector_callback.patch slub-fix-a-possible-memleak-in-__slab_alloc.patch +crypto-sha512-use-standard-ror64.patch diff --git a/review-3.0/slub-fix-a-possible-memleak-in-__slab_alloc.patch b/releases/3.0.22/slub-fix-a-possible-memleak-in-__slab_alloc.patch similarity index 100% rename from review-3.0/slub-fix-a-possible-memleak-in-__slab_alloc.patch rename to releases/3.0.22/slub-fix-a-possible-memleak-in-__slab_alloc.patch diff --git a/review-3.0/writeback-fix-dereferencing-null-bdi-dev-on-trace_writeback_queue.patch b/releases/3.0.22/writeback-fix-dereferencing-null-bdi-dev-on-trace_writeback_queue.patch similarity index 100% rename from review-3.0/writeback-fix-dereferencing-null-bdi-dev-on-trace_writeback_queue.patch rename to releases/3.0.22/writeback-fix-dereferencing-null-bdi-dev-on-trace_writeback_queue.patch diff --git a/review-3.0/xen-pvhvm-do-not-remap-pirqs-onto-evtchns-if-xen_have_vector_callback.patch b/releases/3.0.22/xen-pvhvm-do-not-remap-pirqs-onto-evtchns-if-xen_have_vector_callback.patch similarity index 100% rename from review-3.0/xen-pvhvm-do-not-remap-pirqs-onto-evtchns-if-xen_have_vector_callback.patch rename to releases/3.0.22/xen-pvhvm-do-not-remap-pirqs-onto-evtchns-if-xen_have_vector_callback.patch diff --git a/review-3.2/series b/review-3.2/series index e1489fa99fc..9019db67296 100644 --- a/review-3.2/series +++ b/review-3.2/series @@ -26,3 +26,4 @@ alsa-hda-fix-silent-speaker-output-on-acer-aspire-6935.patch mmc-atmel-mci-save-and-restore-sdioirq-when-soft-reset-is-performed.patch mmc-dw_mmc-fix-pio-mode-with-support-of-highmem.patch xen-pvhvm-do-not-remap-pirqs-onto-evtchns-if-xen_have_vector_callback.patch +crypto-sha512-use-standard-ror64.patch