Patched in Tegra support.

1 files changed, 7 insertions, 15 deletions

diff --git a/crypto/xor.c b/crypto/xor.c
index 35d6b3adf23..b75182d8ab1 100644
--- a/crypto/xor.c
+++ b/crypto/xor.c
@@ -21,7 +21,6 @@
 #include <linux/gfp.h>
 #include <linux/raid/xor.h>
 #include <linux/jiffies.h>
-#include <linux/preempt.h>
 #include <asm/xor.h>
 
 /* The xor routines to use.  */
@@ -56,22 +55,20 @@ xor_blocks(unsigned int src_count, unsigned int bytes, void *dest, void **srcs)
 EXPORT_SYMBOL(xor_blocks);
 
 /* Set of all registered templates.  */
-static struct xor_block_template *__initdata template_list;
+static struct xor_block_template *template_list;
 
 #define BENCH_SIZE (PAGE_SIZE)
 
-static void __init
+static void
 do_xor_speed(struct xor_block_template *tmpl, void *b1, void *b2)
 {
         int speed;
-        unsigned long now, j;
+        unsigned long now;
         int i, count, max;
 
         tmpl->next = template_list;
         template_list = tmpl;
 
-        preempt_disable();
-
         /*
          * Count the number of XORs done during a whole jiffy, and use
          * this to calculate the speed of checksumming.  We use a 2-page
@@ -79,11 +76,9 @@ do_xor_speed(struct xor_block_template *tmpl, void *b1, void *b2)
          */
         max = 0;
         for (i = 0; i < 5; i++) {
-                j = jiffies;
+                now = jiffies;
                 count = 0;
-                while ((now = jiffies) == j)
-                        cpu_relax();
-                while (time_before(jiffies, now + 1)) {
+                while (jiffies == now) {
                         mb(); /* prevent loop optimzation */
                         tmpl->do_2(BENCH_SIZE, b1, b2);
                         mb();
@@ -94,8 +89,6 @@ do_xor_speed(struct xor_block_template *tmpl, void *b1, void *b2)
                         max = count;
         }
 
-        preempt_enable();
-
         speed = max * (HZ * BENCH_SIZE / 1024);
         tmpl->speed = speed;
 
@@ -136,9 +129,9 @@ calibrate_xor_blocks(void)
 
         if (fastest) {
                 printk(KERN_INFO "xor: automatically using best "
-                                 "checksumming function:\n");
+                        "checksumming function: %s\n",
+                        fastest->name);
                 xor_speed(fastest);
-                goto out;
         } else {
                 printk(KERN_INFO "xor: measuring software checksum speed\n");
                 XOR_TRY_TEMPLATES;
@@ -153,7 +146,6 @@ calibrate_xor_blocks(void)
 
 #undef xor_speed
 
- out:
         free_pages((unsigned long)b1, 2);
 
         active_template = fastest;