- add-bcm43xx-hw-rng-support-locking-update.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled

     add-bcm43xx-hw-rng-support-locking-update

has been removed from the -mm tree.  Its filename is

     add-bcm43xx-hw-rng-support-locking-update.patch

This patch was dropped because it was folded into add-bcm43xx-hw-rng-support.patch

------------------------------------------------------
Subject: add-bcm43xx-hw-rng-support-locking-update
From: Andrew Morton <akpm@xxxxxxxx>


Someone redid the locking primitives.

Badly.  What's all this obfuscation?

#define bcm43xx_lock_noirq(bcm)        mutex_lock(&(bcm)->mutex)
#define bcm43xx_unlock_noirq(bcm)      mutex_unlock(&(bcm)->mutex)

#define bcm43xx_lock_irqonly(bcm, flags)       \
       spin_lock_irqsave(&(bcm)->irq_lock, flags)

Please, lose the macros and just open-code the locking.

And I must say that patch's changelog is ultralame.

Cc: Michael Buesch <mb@xxxxxxxxx>
Cc: Jeff Garzik <jeff@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---

 drivers/net/wireless/bcm43xx/bcm43xx_main.c |    4 ++--
 net/wireless/bcm43xx/Kconfig                |    0 
 2 files changed, 2 insertions(+), 2 deletions(-)

diff -puN drivers/net/wireless/bcm43xx/bcm43xx.h~add-bcm43xx-hw-rng-support-locking-update drivers/net/wireless/bcm43xx/bcm43xx.h
diff -puN drivers/net/wireless/bcm43xx/bcm43xx_main.c~add-bcm43xx-hw-rng-support-locking-update drivers/net/wireless/bcm43xx/bcm43xx_main.c
--- a/drivers/net/wireless/bcm43xx/bcm43xx_main.c~add-bcm43xx-hw-rng-support-locking-update
+++ a/drivers/net/wireless/bcm43xx/bcm43xx_main.c
@@ -3242,9 +3242,9 @@ static int bcm43xx_rng_read(struct hwrng
 	struct bcm43xx_private *bcm = (struct bcm43xx_private *)rng->priv;
 	unsigned long flags;
 
-	bcm43xx_lock(bcm, flags);
+	bcm43xx_lock_irqonly(bcm, flags);
 	*data = bcm43xx_read16(bcm, BCM43xx_MMIO_RNG);
-	bcm43xx_unlock(bcm, flags);
+	bcm43xx_unlock_irqonly(bcm, flags);
 
 	return (sizeof(u16));
 }
diff -puN drivers/net/wireless/bcm43xx/Kconfig~add-bcm43xx-hw-rng-support-locking-update drivers/net/wireless/bcm43xx/Kconfig
_

Patches currently in -mm which might be from akpm@xxxxxxxx are

origin.patch
add-bcm43xx-hw-rng-support.patch
add-bcm43xx-hw-rng-support-locking-update.patch
hangcheck-remove-monotomic_clock-on-x86.patch
sched-fix-smt-nice-lock-contention-and-optimization-tidy.patch
swap_prefetch-vs-zoned-counters.patch
pi-futex-rt-mutex-tester-fix.patch
rtmutex-propagate-priority-settings-into-pi-lock-chains-fix.patch
mark-address_space_operations-const-vs-ecryptfs-mmap-operations.patch
ecryptfs-alpha-build-fix.patch
ecryptfs-more-elegant-aes-key-size-manipulation-tidy.patch
ecryptfs-get_sb_dev-fix.patch
namespaces-add-nsproxy-dont-include-compileh.patch
namespaces-utsname-switch-to-using-uts-namespaces-alpha-fix.patch
namespaces-utsname-use-init_utsname-when-appropriate-cifs-update.patch
namespaces-utsname-implement-utsname-namespaces-export.patch
namespaces-utsname-implement-utsname-namespaces-dont-include-compileh.patch
namespaces-utsname-sysctl-hack-cleanup-2-fix.patch
ipc-namespace-core-fix.patch
task-watchers-task-watchers-tidy.patch
task-watchers-add-support-for-per-task-watchers-warning-fix.patch
readahead-sysctl-parameters-fix.patch
make-copy_from_user_inatomic-not-zero-the-tail-on-i386-vs-reiser4.patch
reiser4-hardirq-include-fix.patch
reiser4-run-truncate_inode_pages-in-reiser4_delete_inode.patch
reiser4-get_sb_dev-fix.patch
reiser4-vs-zoned-allocator.patch
hpt3xx-rework-rate-filtering-tidy.patch
savagefb-add-state-save-and_restore-hooks-tidy.patch
au1100fb-add-power-management-support-tidy.patch
imacfb-add-intel-based-macintosh-framebuffer-support-tidy.patch
vt-binding-add-sysfs-control-to-the-vt-layer-fix.patch
lib-add-idr_replace-tidy.patch
genirq-rename-desc-handler-to-desc-chip-power-fix.patch
genirq-rename-desc-handler-to-desc-chip-ia64-fix.patch
genirq-rename-desc-handler-to-desc-chip-ia64-fix-2.patch
genirq-rename-desc-handler-to-desc-chip-terminate_irqs-fix.patch
genirq-ia64-build-fix.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux