Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

#include <linux/delay.h>

#include <linux/device.h>

#include <linux/err.h>

#include <linux/freezer.h>

#include <linux/fs.h>

#include <linux/hw_random.h>

#include <linux/kernel.h>

{

	long rc;

	set_freezable();

	while (!kthread_freezable_should_stop(NULL)) {

	while (!kthread_should_stop()) {

		struct hwrng *rng;

		rng = get_current_rng();

#include <linux/percpu.h>

#include <linux/cryptohash.h>

#include <linux/fips.h>

#include <linux/freezer.h>

#include <linux/ptrace.h>

#include <linux/workqueue.h>

#include <linux/irq.h>

	 * We'll be woken up again once below random_write_wakeup_thresh,

	 * or when the calling thread is about to terminate.

	 */

	wait_event_freezable(random_write_wait,

			kthread_should_stop() ||

	wait_event_interruptible(random_write_wait, kthread_should_stop() ||

			ENTROPY_BITS(&input_pool) <= random_write_wakeup_bits);

	mix_pool_bytes(poolp, buffer, count);

	credit_entropy_bits(poolp, entropy);