- 3.13.4

[packages/kernel.git] / dm-crypt-remove-percpu.patch

diff --git a/dm-crypt-remove-percpu.patch b/dm-crypt-remove-percpu.patch
index 246727660ab859bfb33df50532e0fcf64bcef38c..d08a5069703bbf60690b632e7088485eede1b12b 100644 (file)
--- a/dm-crypt-remove-percpu.patch
+++ b/dm-crypt-remove-percpu.patch
@@ -9,10 +9,10 @@ Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
  drivers/md/dm-crypt.c |   61 +++++++++-----------------------------------------
  1 file changed, 12 insertions(+), 49 deletions(-)
 
-Index: linux-3.8.6-fast/drivers/md/dm-crypt.c
+Index: linux-3.10.4-fast/drivers/md/dm-crypt.c
 ===================================================================
---- linux-3.8.6-fast.orig/drivers/md/dm-crypt.c        2013-04-11 17:29:10.000000000 +0200
-+++ linux-3.8.6-fast/drivers/md/dm-crypt.c     2013-04-11 17:29:10.000000000 +0200
+--- linux-3.10.4-fast.orig/drivers/md/dm-crypt.c       2013-07-31 16:59:48.000000000 +0200
++++ linux-3.10.4-fast/drivers/md/dm-crypt.c    2013-07-31 17:03:10.000000000 +0200
 @@ -18,7 +18,6 @@
  #include <linux/crypto.h>
  #include <linux/workqueue.h>
@@ -119,7 +119,7 @@ Index: linux-3.8.6-fast/drivers/md/dm-crypt.c
                        ctx->cc_sector++;
                        continue;
  
-@@ -877,6 +856,7 @@ static struct dm_crypt_io *crypt_io_allo
+@@ -876,6 +855,7 @@ static struct dm_crypt_io *crypt_io_allo
        io->sector = sector;
        io->error = 0;
        io->base_io = NULL;
@@ -127,7 +127,7 @@ Index: linux-3.8.6-fast/drivers/md/dm-crypt.c
        atomic_set(&io->io_pending, 0);
  
        return io;
-@@ -902,6 +882,8 @@ static void crypt_dec_pending(struct dm_
+@@ -901,6 +881,8 @@ static void crypt_dec_pending(struct dm_
        if (!atomic_dec_and_test(&io->io_pending))
                return;
  
@@ -136,7 +136,7 @@ Index: linux-3.8.6-fast/drivers/md/dm-crypt.c
        mempool_free(io, cc->io_pool);
  
        if (likely(!base_io))
-@@ -1329,8 +1311,6 @@ static int crypt_wipe_key(struct crypt_c
+@@ -1326,8 +1308,6 @@ static int crypt_wipe_key(struct crypt_c
  static void crypt_dtr(struct dm_target *ti)
  {
        struct crypt_config *cc = ti->private;
@@ -145,7 +145,7 @@ Index: linux-3.8.6-fast/drivers/md/dm-crypt.c
  
        ti->private = NULL;
  
-@@ -1342,13 +1322,6 @@ static void crypt_dtr(struct dm_target *
+@@ -1339,13 +1319,6 @@ static void crypt_dtr(struct dm_target *
        if (cc->crypt_queue)
                destroy_workqueue(cc->crypt_queue);
  
@@ -159,7 +159,7 @@ Index: linux-3.8.6-fast/drivers/md/dm-crypt.c
        crypt_free_tfms(cc);
  
        if (cc->bs)
-@@ -1367,9 +1340,6 @@ static void crypt_dtr(struct dm_target *
+@@ -1364,9 +1337,6 @@ static void crypt_dtr(struct dm_target *
        if (cc->dev)
                dm_put_device(ti, cc->dev);
  
@@ -169,7 +169,7 @@ Index: linux-3.8.6-fast/drivers/md/dm-crypt.c
        kzfree(cc->cipher);
        kzfree(cc->cipher_string);
  
-@@ -1424,13 +1394,6 @@ static int crypt_ctr_cipher(struct dm_ta
+@@ -1421,13 +1391,6 @@ static int crypt_ctr_cipher(struct dm_ta
        if (tmp)
                DMWARN("Ignoring unexpected additional cipher options");