diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-07 04:55:03 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-07 04:55:03 -0400 |
commit | 4fb8af10d0fd09372d52966b76922b9e82bbc950 (patch) | |
tree | d240e4d40357583e3f3eb228dccf20122a5b31ed /drivers/char/hw_random | |
parent | f44f82e8a20b98558486eb14497b2f71c78fa325 (diff) | |
parent | 64a99d2a8c3ed5c4e39f3ae1cc682aa8fd3977fc (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
Diffstat (limited to 'drivers/char/hw_random')
-rw-r--r-- | drivers/char/hw_random/intel-rng.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/char/hw_random/intel-rng.c b/drivers/char/hw_random/intel-rng.c index 27fdc0866496..8a2fce0756ec 100644 --- a/drivers/char/hw_random/intel-rng.c +++ b/drivers/char/hw_random/intel-rng.c | |||
@@ -241,7 +241,7 @@ static int __init intel_rng_hw_init(void *_intel_rng_hw) | |||
241 | struct intel_rng_hw *intel_rng_hw = _intel_rng_hw; | 241 | struct intel_rng_hw *intel_rng_hw = _intel_rng_hw; |
242 | u8 mfc, dvc; | 242 | u8 mfc, dvc; |
243 | 243 | ||
244 | /* interrupts disabled in stop_machine_run call */ | 244 | /* interrupts disabled in stop_machine call */ |
245 | 245 | ||
246 | if (!(intel_rng_hw->fwh_dec_en1_val & FWH_F8_EN_MASK)) | 246 | if (!(intel_rng_hw->fwh_dec_en1_val & FWH_F8_EN_MASK)) |
247 | pci_write_config_byte(intel_rng_hw->dev, | 247 | pci_write_config_byte(intel_rng_hw->dev, |
@@ -365,10 +365,10 @@ static int __init mod_init(void) | |||
365 | * location with the Read ID command, all activity on the system | 365 | * location with the Read ID command, all activity on the system |
366 | * must be stopped until the state is back to normal. | 366 | * must be stopped until the state is back to normal. |
367 | * | 367 | * |
368 | * Use stop_machine_run because IPIs can be blocked by disabling | 368 | * Use stop_machine because IPIs can be blocked by disabling |
369 | * interrupts. | 369 | * interrupts. |
370 | */ | 370 | */ |
371 | err = stop_machine_run(intel_rng_hw_init, intel_rng_hw, NR_CPUS); | 371 | err = stop_machine(intel_rng_hw_init, intel_rng_hw, NULL); |
372 | pci_dev_put(dev); | 372 | pci_dev_put(dev); |
373 | iounmap(intel_rng_hw->mem); | 373 | iounmap(intel_rng_hw->mem); |
374 | kfree(intel_rng_hw); | 374 | kfree(intel_rng_hw); |