drop a 4.9 random patch for now

diff --git a/queue-4.9/random-set-up-the-numa-crng-instances-after-the-crng-is-fully-initialized.patch b/pending/queue-4.9/random-set-up-the-numa-crng-instances-after-the-crng-is-fully-initialized.patch
similarity index 100%
rename from queue-4.9/random-set-up-the-numa-crng-instances-after-the-crng-is-fully-initialized.patch
rename to pending/queue-4.9/random-set-up-the-numa-crng-instances-after-the-crng-is-fully-initialized.patch

diff --git a/queue-4.9/random-add-new-ioctl-rndreseedcrng.patch b/queue-4.9/random-add-new-ioctl-rndreseedcrng.patch
index ce3851013bd833bc3784159a654ea9c674fd5f18..c06715218952c10064fe300c0114bff6717ad1f0 100644 (file)
--- a/queue-4.9/random-add-new-ioctl-rndreseedcrng.patch
+++ b/queue-4.9/random-add-new-ioctl-rndreseedcrng.patch
@@ -28,7 +28,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  #define CRNG_INIT_CNT_THRESH (2*CHACHA20_KEY_SIZE)
  static void _extract_crng(struct crng_state *crng,
                          __u8 out[CHACHA20_BLOCK_SIZE]);
-@@ -900,7 +901,8 @@ static void _extract_crng(struct crng_st
+@@ -873,7 +874,8 @@ static void _extract_crng(struct crng_st
        unsigned long v, flags;
  
        if (crng_ready() &&
@@ -38,15 +38,15 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
                crng_reseed(crng, crng == &primary_crng ? &input_pool : NULL);
        spin_lock_irqsave(&crng->lock, flags);
        if (arch_get_random_long(&v))
-@@ -1689,6 +1691,7 @@ static int rand_initialize(void)
+@@ -1668,6 +1670,7 @@ static int rand_initialize(void)
        init_std_data(&input_pool);
        init_std_data(&blocking_pool);
        crng_initialize(&primary_crng);
 +      crng_global_init_time = jiffies;
-       return 0;
- }
- early_initcall(rand_initialize);
-@@ -1862,6 +1865,14 @@ static long random_ioctl(struct file *f,
+ 
+ #ifdef CONFIG_NUMA
+       pool = kcalloc(nr_node_ids, sizeof(*pool), GFP_KERNEL|__GFP_NOFAIL);
+@@ -1854,6 +1857,14 @@ static long random_ioctl(struct file *f,
                input_pool.entropy_count = 0;
                blocking_pool.entropy_count = 0;
                return 0;

diff --git a/queue-4.9/random-crng_reseed-should-lock-the-crng-instance-that-it-is-modifying.patch b/queue-4.9/random-crng_reseed-should-lock-the-crng-instance-that-it-is-modifying.patch
index 9d0401b7739777d78d77dcd111078a1554d6c498..a8ed85f26817b6b6dff9f5b0659031af2e4cb0e1 100644 (file)
--- a/queue-4.9/random-crng_reseed-should-lock-the-crng-instance-that-it-is-modifying.patch
+++ b/queue-4.9/random-crng_reseed-should-lock-the-crng-instance-that-it-is-modifying.patch
@@ -20,7 +20,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- a/drivers/char/random.c
 +++ b/drivers/char/random.c
-@@ -862,7 +862,7 @@ static void crng_reseed(struct crng_stat
+@@ -836,7 +836,7 @@ static void crng_reseed(struct crng_stat
                _crng_backtrack_protect(&primary_crng, buf.block,
                                        CHACHA20_KEY_SIZE);
        }
@@ -29,7 +29,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        for (i = 0; i < 8; i++) {
                unsigned long   rv;
                if (!arch_get_random_seed_long(&rv) &&
-@@ -879,7 +879,7 @@ static void crng_reseed(struct crng_stat
+@@ -852,7 +852,7 @@ static void crng_reseed(struct crng_stat
                wake_up_interruptible(&crng_init_wait);
                pr_notice("random: crng init done\n");
        }

diff --git a/queue-4.9/series b/queue-4.9/series
index 5b7d20bcacf6da254b4bf2554c1ea2d6dbfae956..c8881783d5e375875134cfbd7437a4b14ec6907c 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -72,7 +72,6 @@ alsa-line6-use-correct-endpoint-type-for-midi-output.patch
 alsa-rawmidi-fix-missing-input-substream-checks-in-compat-ioctls.patch
 alsa-hda-new-via-controller-suppor-no-snoop-path.patch
 random-fix-crng_ready-test.patch
-random-set-up-the-numa-crng-instances-after-the-crng-is-fully-initialized.patch
 random-crng_reseed-should-lock-the-crng-instance-that-it-is-modifying.patch
 random-add-new-ioctl-rndreseedcrng.patch
 hid-hidraw-fix-crash-on-hidiocgfeature-with-a-destroyed-device.patch