diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-04 15:23:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-04 15:23:14 -0700 |
| commit | b7c8e55db7141dcbb9d5305a3260fa0ed62a1bcc (patch) | |
| tree | 59fbd52d8e80e5a83d9747961d28aaf4d400613a /drivers/char | |
| parent | ffd386a9a8273dcfa61705d0b349eebc7525ef87 (diff) | |
| parent | 4015d9a865e3bcc42d88bedc8ce1551000bab664 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (39 commits)
random: Reorder struct entropy_store to remove padding on 64bits
padata: update API documentation
padata: Remove padata_get_cpumask
crypto: pcrypt - Update pcrypt cpumask according to the padata cpumask notifier
crypto: pcrypt - Rename pcrypt_instance
padata: Pass the padata cpumasks to the cpumask_change_notifier chain
padata: Rearrange set_cpumask functions
padata: Rename padata_alloc functions
crypto: pcrypt - Dont calulate a callback cpu on empty callback cpumask
padata: Check for valid cpumasks
padata: Allocate cpumask dependend recources in any case
padata: Fix cpu index counting
crypto: geode_aes - Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used)
pcrypt: Added sysfs interface to pcrypt
padata: Added sysfs primitives to padata subsystem
padata: Make two separate cpumasks
padata: update documentation
padata: simplify serialization mechanism
padata: make padata_do_parallel to return zero on success
padata: Handle empty padata cpumasks
...
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/hw_random/n2-drv.c | 2 | ||||
| -rw-r--r-- | drivers/char/random.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/hw_random/n2-drv.c b/drivers/char/hw_random/n2-drv.c index 0f9cbf1aaf15..101d5f235547 100644 --- a/drivers/char/hw_random/n2-drv.c +++ b/drivers/char/hw_random/n2-drv.c @@ -387,7 +387,7 @@ static int n2rng_init_control(struct n2rng *np) static int n2rng_data_read(struct hwrng *rng, u32 *data) { - struct n2rng *np = (struct n2rng *) rng->priv; + struct n2rng *np = rng->priv; unsigned long ra = __pa(&np->test_data); int len; diff --git a/drivers/char/random.c b/drivers/char/random.c index 8d85587b6d4f..caef35a46890 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -407,8 +407,8 @@ struct entropy_store { struct poolinfo *poolinfo; __u32 *pool; const char *name; - int limit; struct entropy_store *pull; + int limit; /* read-write data: */ spinlock_t lock; |