diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2014-10-27 22:55:39 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2014-10-27 22:55:39 +0000 |
| commit | 2644af4717cf9cc3cf89564ca017f596a7dcad05 (patch) | |
| tree | 7f2121f700446e60159a365094fdc6eea16d5cb7 /target/linux/generic/patches-3.18/941-ocf_20120127.patch | |
| parent | 5e558fcd48c8c4acb87fe7bcf3eb2a66bb279503 (diff) | |
| download | master-187ad058-2644af4717cf9cc3cf89564ca017f596a7dcad05.tar.gz master-187ad058-2644af4717cf9cc3cf89564ca017f596a7dcad05.tar.bz2 master-187ad058-2644af4717cf9cc3cf89564ca017f596a7dcad05.zip | |
kernel: make the kernel 3.18 patches apply and boot on arm.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43095 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.18/941-ocf_20120127.patch')
| -rw-r--r-- | target/linux/generic/patches-3.18/941-ocf_20120127.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/generic/patches-3.18/941-ocf_20120127.patch b/target/linux/generic/patches-3.18/941-ocf_20120127.patch index e67cb04221..cc512f8359 100644 --- a/target/linux/generic/patches-3.18/941-ocf_20120127.patch +++ b/target/linux/generic/patches-3.18/941-ocf_20120127.patch @@ -40,7 +40,7 @@ + */ +void random_input_words(__u32 *buf, size_t wordcount, int ent_count) +{ -+ mix_pool_bytes(&input_pool, buf, wordcount*4, NULL); ++ mix_pool_bytes(&input_pool, buf, wordcount*4); + + credit_entropy_bits(&input_pool, ent_count); + @@ -50,7 +50,7 @@ + * Wake up waiting processes if we have enough + * entropy. + */ -+ if (input_pool.entropy_count >= random_read_wakeup_thresh) ++ if (input_pool.entropy_count >= random_read_wakeup_bits) + wake_up_interruptible(&random_read_wait); +} +EXPORT_SYMBOL(random_input_words); @@ -67,16 +67,16 @@ + int count; + + wait_event_interruptible(random_write_wait, -+ input_pool.entropy_count < random_write_wakeup_thresh); ++ input_pool.entropy_count < random_write_wakeup_bits); + -+ count = random_write_wakeup_thresh - input_pool.entropy_count; ++ count = random_write_wakeup_bits - input_pool.entropy_count; + + /* likely we got woken up due to a signal */ -+ if (count <= 0) count = random_read_wakeup_thresh; ++ if (count <= 0) count = random_read_wakeup_bits; + + pr_notice("requesting %d bits from input_wait()er %d<%d\n", + count, -+ input_pool.entropy_count, random_write_wakeup_thresh); ++ input_pool.entropy_count, random_write_wakeup_bits); + + return count; +} |