dropped a 4.14 random patch

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

diff --git a/queue-4.14/random-add-new-ioctl-rndreseedcrng.patch b/queue-4.14/random-add-new-ioctl-rndreseedcrng.patch
index 13e6f1e2bdcbafa9733ac34b5bc8b7c346a3648c..d4d7ea80e653debe274f12bcc91e0a04a1fcffb3 100644 (file)
--- a/queue-4.14/random-add-new-ioctl-rndreseedcrng.patch
+++ b/queue-4.14/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]);
-@@ -932,7 +933,8 @@ static void _extract_crng(struct crng_st
+@@ -905,7 +906,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))
-@@ -1759,6 +1761,7 @@ static int rand_initialize(void)
+@@ -1738,6 +1740,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);
-@@ -1932,6 +1935,14 @@ static long random_ioctl(struct file *f,
+ 
+ #ifdef CONFIG_NUMA
+       pool = kcalloc(nr_node_ids, sizeof(*pool), GFP_KERNEL|__GFP_NOFAIL);
+@@ -1924,6 +1927,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.14/random-crng_reseed-should-lock-the-crng-instance-that-it-is-modifying.patch b/queue-4.14/random-crng_reseed-should-lock-the-crng-instance-that-it-is-modifying.patch
index e76e60c046fc7388c44161591d2d317afc82202f..b3bcea9f356ee600b613ad6dd5ce0913acd0b61f 100644 (file)
--- a/queue-4.14/random-crng_reseed-should-lock-the-crng-instance-that-it-is-modifying.patch
+++ b/queue-4.14/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
-@@ -905,7 +905,7 @@ static void crng_reseed(struct crng_stat
+@@ -879,7 +879,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) &&
-@@ -915,7 +915,7 @@ static void crng_reseed(struct crng_stat
+@@ -889,7 +889,7 @@ static void crng_reseed(struct crng_stat
        }
        memzero_explicit(&buf, sizeof(buf));
        crng->init_time = jiffies;
@@ -37,4 +37,4 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +      spin_unlock_irqrestore(&crng->lock, flags);
        if (crng == &primary_crng && crng_init < 2) {
                invalidate_batched_entropy();
-               numa_crng_init();
+               crng_init = 2;

diff --git a/queue-4.14/series b/queue-4.14/series
index 155a8a3741bac7845981ad2e095fe6252b76a494..b21cce7b8d73a7b4d95ed9f809acbe7604c59c04 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -132,7 +132,6 @@ alsa-hda-realtek-set-pincfg_headset_mic-to-parse_flags.patch
 alsa-hda-realtek-adjust-the-location-of-one-mic.patch
 random-fix-crng_ready-test.patch
 random-use-a-different-mixing-algorithm-for-add_device_randomness.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-input-fix-battery-level-reporting-on-bt-mice.patch