The patch titled
srcu-rcu-variant-permitting-read-side-blocking-fixes
has been removed from the -mm tree. Its filename is
srcu-rcu-variant-permitting-read-side-blocking-fixes.patch
This patch was dropped because it was folded into srcu-rcu-variant-permitting-read-side-blocking.patch
------------------------------------------------------
Subject: srcu-rcu-variant-permitting-read-side-blocking-fixes
From: Andrew Morton <akpm@xxxxxxxx>
Cc: Paul E. McKenney <paulmck@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/linux/srcu.h | 2 +-
kernel/srcu.c | 9 +++------
2 files changed, 4 insertions(+), 7 deletions(-)
diff -puN Documentation/RCU/checklist.txt~srcu-rcu-variant-permitting-read-side-blocking-fixes Documentation/RCU/checklist.txt
diff -puN Documentation/RCU/rcu.txt~srcu-rcu-variant-permitting-read-side-blocking-fixes Documentation/RCU/rcu.txt
diff -puN Documentation/RCU/whatisRCU.txt~srcu-rcu-variant-permitting-read-side-blocking-fixes Documentation/RCU/whatisRCU.txt
diff -puN include/linux/srcu.h~srcu-rcu-variant-permitting-read-side-blocking-fixes include/linux/srcu.h
--- a/include/linux/srcu.h~srcu-rcu-variant-permitting-read-side-blocking-fixes
+++ a/include/linux/srcu.h
@@ -26,7 +26,7 @@
struct srcu_struct_array {
int c[2];
-} ____cacheline_internode_aligned_in_smp;
+};
struct srcu_struct {
int completed;
diff -puN kernel/Makefile~srcu-rcu-variant-permitting-read-side-blocking-fixes kernel/Makefile
diff -puN kernel/srcu.c~srcu-rcu-variant-permitting-read-side-blocking-fixes kernel/srcu.c
--- a/kernel/srcu.c~srcu-rcu-variant-permitting-read-side-blocking-fixes
+++ a/kernel/srcu.c
@@ -49,7 +49,7 @@ void init_srcu_struct(struct srcu_struct
sp->per_cpu_ref = (struct srcu_struct_array *)
kmalloc(NR_CPUS * sizeof(*sp->per_cpu_ref),
GFP_KERNEL);
- for_each_cpu(cpu) {
+ for_each_possible_cpu(cpu) {
sp->per_cpu_ref[cpu].c[0] = 0;
sp->per_cpu_ref[cpu].c[1] = 0;
}
@@ -121,8 +121,6 @@ void synchronize_srcu(struct srcu_struct
int idx;
int sum;
- might_sleep();
-
mutex_lock(&sp->mutex);
smp_mb(); /* Prevent operations from leaking in. */
@@ -139,9 +137,8 @@ void synchronize_srcu(struct srcu_struct
for (;;) {
sum = 0;
- for_each_cpu(cpu) {
+ for_each_possible_cpu(cpu)
sum += sp->per_cpu_ref[cpu].c[idx];
- }
if (sum == 0)
break;
schedule_timeout_interruptible(1);
@@ -162,7 +159,7 @@ void synchronize_srcu(struct srcu_struct
long srcu_batches_completed(struct srcu_struct *sp)
{
- return (sp->completed);
+ return sp->completed;
}
EXPORT_SYMBOL_GPL(init_srcu_struct);
_
Patches currently in -mm which might be from akpm@xxxxxxxx are
origin.patch
lockdep-add-disable-enable_irq_lockdep-api.patch
lockdep-irqtrace-subsystem-x86_64-support.patch
forcedeth-typecast-cleanup.patch
disable-debugging-version-of-write_lock.patch
acpi-asus-s3-resume-fix-fix.patch
sony_apci-resume.patch
kauditd_thread-warning-fix.patch
git-geode-fixup.patch
git-gfs2.patch
git-gfs2-fixup.patch
gfs2-get_sb_dev-fix.patch
git-ia64.patch
git-ia64-fixup.patch
revert-sparc-build-breakage.patch
git-klibc.patch
git-hdrcleanup-vs-git-klibc-on-ia64.patch
git-hdrcleanup-vs-git-klibc-on-ia64-2.patch
git-libata-all.patch
sata-is-bust-on-s390.patch
git-netdev-all-fixup.patch
8139cp-printk-fix.patch
drivers-net-ns83820c-add-paramter-to-disable-auto.patch
af_unix-datagram-getpeersec-fix.patch
git-pcmcia-fixup.patch
git-sas.patch
serial-8250-sysrq-deadlock-fix.patch
serial-fix-uart_bug_txen-test.patch
revert-gregkh-pci-pci-test-that-drivers-properly-call-pci_set_master.patch
msi-oops-workaround.patch
revert-VIA-quirk-fixup-additional-PCI-IDs.patch
revert-PCI-quirk-VIA-IRQ-fixup-should-only-run-for-VIA-southbridges.patch
areca-raid-linux-scsi-driver.patch
git-scsi-target-fixup.patch
pm-usb-hcds-use-pm_event_prethaw-fix.patch
kill-usb-kconfig-warning.patch
git-supertrak-fixup.patch
bcm43xx-opencoded-locking.patch
sleazy-fpu-feature-x86_64-support-fix.patch
zvc-zone_reclaim-leave-1%-of-unmapped-pagecache-pages-for-file-i-o-tunable-rename.patch
adix-tree-rcu-lockless-readside-update-tidy.patch
mm-tracking-shared-dirty-pages-checks.patch
mm-tracking-shared-dirty-pages-wimp.patch
acx1xx-wireless-driver.patch
tiacx-pci-build-fix.patch
tiacx-ia64-fix.patch
sched-clean-up-fallout-of-recent-changes.patch
deprecate-smbfs-in-favour-of-cifs.patch
edac-new-opteron-athlon64-memory-controller-driver-tidy.patch
reiserfs-on-demand-bitmap-loading.patch
per-task-delay-accounting-taskstats-interface.patch
per-task-delay-accounting-proc-export-of-aggregated-block-i-o-delays.patch
delay-accounting-taskstats-interface-send-tgid-once.patch
swap_prefetch-vs-zoned-counters.patch
ecryptfs-mmap-operations.patch
ecryptfs-alpha-build-fix.patch
ecryptfs-more-elegant-aes-key-size-manipulation.patch
ecryptfs-get_sb_dev-fix.patch
namespaces-add-nsproxy-dont-include-compileh.patch
namespaces-utsname-switch-to-using-uts-namespaces.patch
namespaces-utsname-use-init_utsname-when-appropriate.patch
namespaces-utsname-implement-utsname-namespaces.patch
namespaces-utsname-sysctl-hack.patch
ipc-namespace-core.patch
task-watchers-task-watchers.patch
task-watchers-add-support-for-per-task-watchers.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
md-oops-workaround.patch
genirq-convert-the-i386-architecture-to-irq-chips.patch
genirq-x86_64-irq-reenable-migrating-irqs-to-other-cpus.patch
genirq-msi-simplify-msi-enable-and-disable.patch
genirq-ia64-irq-dynamic-irq-support.patch
genirq-i386-irq-remove-the-msi-assumption-that-irq-==-vector.patch
srcu-rcu-variant-permitting-read-side-blocking.patch
srcu-rcu-variant-permitting-read-side-blocking-fixes.patch
srcu-add-srcu-operations-to-rcutorture-fix.patch
srcu-2-add-srcu-operations-to-rcutorture-fix.patch
make-more-file_operation-structs-static.patch
nr_blockdev_pages-in_interrupt-warning.patch
device-suspend-debug.patch
revert-tty-buffering-comment-out-debug-code.patch
slab-leaks3-default-y.patch
x86-kmap_atomic-debugging.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
