The patch titled
revert x86_64-mm-cleanup-spinlock
has been removed from the -mm tree. Its filename is
revert-x86_64-mm-cleanup-spinlock.patch
This patch was dropped because it is obsolete
------------------------------------------------------
Subject: revert x86_64-mm-cleanup-spinlock
From: Andrew Morton <akpm@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/asm-x86_64/rwlock.h | 14 ++++
include/asm-x86_64/spinlock.h | 96 +++++++++++++++-----------------
2 files changed, 59 insertions(+), 51 deletions(-)
diff -puN include/asm-x86_64/rwlock.h~revert-x86_64-mm-cleanup-spinlock include/asm-x86_64/rwlock.h
--- a/include/asm-x86_64/rwlock.h~revert-x86_64-mm-cleanup-spinlock
+++ a/include/asm-x86_64/rwlock.h
@@ -20,4 +20,18 @@
#define RW_LOCK_BIAS 0x01000000
+#define __build_read_lock(rw) \
+ asm volatile(LOCK_PREFIX "subl $1,(%0)\n\t" \
+ "jns 1f\n" \
+ "call __read_lock_failed\n" \
+ "1:\n" \
+ ::"D" (rw), "i" (RW_LOCK_BIAS) : "memory")
+
+#define __build_write_lock(rw) \
+ asm volatile(LOCK_PREFIX "subl %1,(%0)\n\t" \
+ "jz 1f\n" \
+ "\tcall __write_lock_failed\n\t" \
+ "1:\n" \
+ ::"D" (rw), "i" (RW_LOCK_BIAS) : "memory")
+
#endif
diff -puN include/asm-x86_64/spinlock.h~revert-x86_64-mm-cleanup-spinlock include/asm-x86_64/spinlock.h
--- a/include/asm-x86_64/spinlock.h~revert-x86_64-mm-cleanup-spinlock
+++ a/include/asm-x86_64/spinlock.h
@@ -16,30 +16,51 @@
* (the type definitions are in asm/spinlock_types.h)
*/
-static inline int __raw_spin_is_locked(raw_spinlock_t *lock)
-{
- return *(volatile signed int *)(&lock->slock) <= 0;
-}
+#define __raw_spin_is_locked(x) \
+ (*(volatile signed int *)(&(x)->slock) <= 0)
+
+#define __raw_spin_lock_string \
+ "\n0:\t" \
+ LOCK_PREFIX " ; decl %0\n\t" \
+ "jns 2f\n" \
+ "1:\n\t" \
+ "rep;nop\n\t" \
+ "cmpl $0,%0\n\t" \
+ "jle 1b\n\t" \
+ "jmp 0b\n" \
+ "2:\t"
+
+#define __raw_spin_lock_string_flags \
+ "\n1:\t" \
+ LOCK_PREFIX "; decb %0\n\t" \
+ "js 2f\n\t" \
+ LOCK_SECTION_START("") \
+ "2:\t" \
+ "test $0x200, %1\n\t" \
+ "jz 3f\n\t" \
+ "sti\n\t" \
+ "3:\t" \
+ "rep;nop\n\t" \
+ "cmpb $0, %0\n\t" \
+ "jle 3b\n\t" \
+ "cli\n\t" \
+ "jmp 1b\n" \
+ LOCK_SECTION_END
+
+#define __raw_spin_unlock_string \
+ "movl $1,%0" \
+ :"=m" (lock->slock) : : "memory"
static inline void __raw_spin_lock(raw_spinlock_t *lock)
{
- asm volatile(
- "\n0:\t"
- LOCK_PREFIX " ; decl %0\n\t"
- "jns 2f\n"
- "1:\n\t"
- "rep;nop\n\t"
- "cmpl $0,%0\n\t"
- "jle 1b\n\t"
- "jmp 0b\n"
- "2:\t" : "=m" (lock->slock) : : "memory");
+ asm(__raw_spin_lock_string : "=m" (lock->slock) : : "memory");
}
static inline int __raw_spin_trylock(raw_spinlock_t *lock)
{
int oldval;
- asm volatile(
+ __asm__ __volatile__(
"xchgl %0,%1"
:"=q" (oldval), "=m" (lock->slock)
:"0" (0) : "memory");
@@ -49,28 +70,16 @@ static inline int __raw_spin_trylock(raw
static inline void __raw_spin_lock_flags(raw_spinlock_t *lock, unsigned long flags)
{
- asm volatile(
- "\n1:\t"
- LOCK_PREFIX "; decb %0\n\t"
- "js 2f\n\t"
- LOCK_SECTION_START("")
- "2:\t"
- "test $0x200, %1\n\t"
- "jz 3f\n\t"
- "sti\n\t"
- "3:\t"
- "rep;nop\n\t"
- "cmpb $0, %0\n\t"
- "jle 3b\n\t"
- "cli\n\t"
- "jmp 1b\n"
- LOCK_SECTION_END
+ __asm__ __volatile__(
+ __raw_spin_lock_string_flags
:"=m" (lock->slock) : "r" (flags) : "memory");
}
static inline void __raw_spin_unlock(raw_spinlock_t *lock)
{
- asm volatile("movl $1,%0" :"=m" (lock->slock) : : "memory");
+ __asm__ __volatile__(
+ __raw_spin_unlock_string
+ );
}
#define __raw_spin_unlock_wait(lock) \
@@ -90,32 +99,17 @@ static inline void __raw_spin_unlock(raw
* with the high bit (sign) being the "contended" bit.
*/
-static inline int __raw_read_can_lock(raw_rwlock_t *rw)
-{
- return (int)rw->lock > 0;
-}
-
-static inline int __raw_write_can_lock(raw_rwlock_t *rw)
-{
- return rw->lock == RW_LOCK_BIAS;
-}
+#define __raw_read_can_lock(x) ((int)(x)->lock > 0)
+#define __raw_write_can_lock(x) ((x)->lock == RW_LOCK_BIAS)
static inline void __raw_read_lock(raw_rwlock_t *rw)
{
- asm volatile(LOCK_PREFIX "subl $1,(%0)\n\t"
- "jns 1f\n"
- "call __read_lock_failed\n"
- "1:\n"
- ::"D" (rw), "i" (RW_LOCK_BIAS) : "memory");
+ __build_read_lock(rw);
}
static inline void __raw_write_lock(raw_rwlock_t *rw)
{
- asm volatile(LOCK_PREFIX "subl %1,(%0)\n\t"
- "jz 1f\n"
- "\tcall __write_lock_failed\n\t"
- "1:\n"
- ::"D" (rw), "i" (RW_LOCK_BIAS) : "memory");
+ __build_write_lock(rw);
}
static inline int __raw_read_trylock(raw_rwlock_t *lock)
_
Patches currently in -mm which might be from akpm@xxxxxxxx are
zvc-scale-thresholds-depending-on-the-size-of-the-system.patch
x86-increase-max_mp_busses-on-default-arch.patch
git-acpi.patch
acpi-asus-s3-resume-fix.patch
sony_apci-resume.patch
git-alsa.patch
kauditd_thread-warning-fix.patch
git-block-fixup.patch
revert-gregkh-driver-class_device_rename-remove.patch
revert-gregkh-driver-network-class_device-to-device.patch
revert-gregkh-driver-tty-device.patch
revert-gregkh-driver-mem-devices.patch
drivers-base-check-errors.patch
scsi-device_reprobe-can-fail.patch
git-drm.patch
git-gfs2.patch
git-ia64.patch
git-ieee1394-fixup.patch
git-input.patch
git-intelfb-fixup.patch
git-kbuild.patch
git-libata-all.patch
asus-mv-device-ids.patch
1-of-2-jmicron-driver-fix.patch
via-pata-controller-xfer-fixes-fix.patch
git-netdev-all.patch
drivers-net-ns83820c-add-paramter-to-disable-auto.patch
git-net.patch
git-net-fixup.patch
git-nfs.patch
git-nfs-fixup.patch
git-pcmcia-fixup.patch
git-powerpc.patch
tickle-nmi-watchdog-on-serial-output-fix.patch
serial-fix-uart_bug_txen-test.patch
pcie-check-and-return-bus_register-errors-fix.patch
git-scsi-misc.patch
revert-scsi-improve-inquiry-printing.patch
fix-panic-when-reinserting-adaptec-pcmcia-scsi-card.patch
git-scsi-target-fixup.patch
git-scsi-target-vs-git-block.patch
git-sas.patch
git-block-vs-git-sas.patch
usb-hub-driver-improve-use-of-ifdef-fix.patch
gregkh-usb-usb-storage-add-rio-karma-eject-support-fix.patch
pm-usb-hcds-use-pm_event_prethaw-fix.patch
rtl8150_disconnect-needs-tasklet_kill.patch
git-supertrak-fixup.patch
git-watchdog.patch
kthread-airoc.patch
x86_64-mm-spin-irqs-enabled-fix.patch
revert-x86_64-mm-cleanup-spinlock.patch
revert-x86_64-mm-i386-remove-alternative-smp.patch
revert-x86_64-mm-remove-alternative-smp.patch
revert-x86_64-mm-spin-irqs-enabled.patch
mm-x86_64-mm-generic-getcpu-syscall-tweaks.patch
revert-x86_64-mm-i386-remove-lock-section.patch
revert-x86_64-mm-detect-cfi.patch
git-cryptodev-fixup.patch
git-cryptodev-fixup-2.patch
adix-tree-rcu-lockless-readside-update-tidy.patch
mm-tracking-shared-dirty-pages-checks.patch
mm-tracking-shared-dirty-pages-wimp.patch
convert-i386-numa-kva-space-to-bootmem-tidy.patch
reduce-max_nr_zones-make-display-of-highmem-counters-conditional-on-config_highmem-tidy.patch
reduce-max_nr_zones-use-enum-to-define-zones-reformat-and-comment-cleanup.patch
reduce-max_nr_zones-use-enum-to-define-zones-reformat-and-comment-fix.patch
reduce-max_nr_zones-remove-display-of-counters-for-unconfigured-zones-s390-fix.patch
out-of-memory-notifier-tidy.patch
mm-swap-write-failure-fixup-fix.patch
slab-optimize-kmalloc_node-the-same-way-as-kmalloc-fix.patch
slab-fix-lockdep-warnings-fix-2.patch
have-x86-use-add_active_range-and-free_area_init_nodes-fix.patch
zone_reclaim-dynamic-slab-reclaim-tidy.patch
acx1xx-wireless-driver.patch
tiacx-pci-build-fix.patch
tiacx-ia64-fix.patch
tiacx-build-fix.patch
selinux-2-3-change-isec-semaphore-to-a-mutex-vs-git-net.patch
binfmt_elf-consistently-use-loff_t.patch
convert-i386-summit-subarch-to-use-srat-info-for-apicid_to_node-calls-tidy.patch
i386-adds-smp_call_function_single-fix.patch
swsusp-write-timer.patch
swsusp-write-speedup.patch
swsusp-read-timer.patch
swsusp-read-speedup.patch
swsusp-read-speedup-fix.patch
swsusp-read-speedup-cleanup.patch
swsusp-read-speedup-cleanup-2.patch
swsusp-read-speedup-fix-fix-2.patch
deprecate-smbfs-in-favour-of-cifs.patch
edac-new-opteron-athlon64-memory-controller-driver-tidy.patch
inode_diet-replace-inodeugeneric_ip-with-inodei_private-gfs-fix.patch
x86-microcode-microcode-driver-cleanup-tidy.patch
x86-microcode-add-sysfs-and-hotplug-support-fix.patch
eisa-bus-modalias-attributes-support-1-fix-git-kbuild-fix.patch
add-address_space_operationsbatch_write-fix.patch
alloc_fdtable-cleanup.patch
sysctl-allow-proc-sys-without-sys_sysctl-fix.patch
add-probe_kernel_address.patch
x86-use-probe_kernel_address-in-handle_bug.patch
blockdevc-check-errors.patch
let-warn_on-warn_on_once-return-the-condition-fix.patch
let-warn_on-warn_on_once-return-the-condition-fix-2.patch
omap-add-watchdog-driver-support-tweaks.patch
move-valid_dma_direction-from-x86_64-to-generic-code-fix.patch
single-bit-flip-detector-tidy.patch
fix-unserialized-task-files-changing-fix.patch
tty-make-termios_sem-a-mutex-fix.patch
solaris-emulation-incorrect-tty-locking-fix.patch
solaris-emulation-incorrect-tty-locking-fix-2.patch
remove-sound-oss-copying.patch
maximum-latency-tracking-infrastructure-tidy.patch
fs-nameic-replace-multiple-current-fs-by-shortcut-variable-tidy.patch
ntp-move-all-the-ntp-related-code-to-ntpc-fix.patch
reiserfs-on-demand-bitmap-loading.patch
streamline-generic_file_-interfaces-and-filemap-gfs-fix.patch
add-vector-aio-support-fix.patch
csa-basic-accounting-over-taskstats-fix.patch
fs-cache-make-kafs-use-fs-cache-fix.patch
fs-cache-make-kafs-use-fs-cache-vs-streamline-generic_file_-interfaces-and-filemap.patch
nfs-use-local-caching-12-fix.patch
stack-overflow-safe-kdump-crash_use_safe_smp_processor_id-fix.patch
generic-ioremap_page_range-x86_64-conversion-fix.patch
vfs-make-filldir_t-and-struct-kstat-deal-in-64-bit-inode-numbers-alpha-fix.patch
some-cleanup-in-the-pipe-code-tidy.patch
support-piping-into-commands-in-proc-sys-kernel-core_pattern-fix.patch
move-pidmap-to-pspaceh-fix.patch
isdn-work-around-excessive-udelay.patch
knfsd-add-a-callback-for-when-last-rpc-thread-finishes-tidy.patch
knfsd-add-a-callback-for-when-last-rpc-thread-finishes-fix.patch
knfsd-separate-out-some-parts-of-nfsd_svc-which-start-nfs-servers-tweaks.patch
knfsd-define-new-nfsdfs-file-portlist-contains-list-of-ports-tidy.patch
knfsd-define-new-nfsdfs-file-portlist-contains-list-of-ports-fix.patch
knfsd-have-ext2-reject-file-handles-with-bad-inode-numbers-early-tidy.patch
knfsd-make-ext3-reject-filehandles-referring-to-invalid-inode-numbers-tidy.patch
knfsd-drop-serv-option-to-svc_recv-and-svc_process-nfs-callback-fix-nfs-callback-fix.patch
knfsd-move-tempsock-aging-to-a-timer-tidy.patch
sched-remove-unnecessary-sched-group-allocations-fix.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
make-kmem_cache_destroy-return-void-ecryptfs.patch
namespaces-add-nsproxy.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
namespaces-utsname-switch-to-using-uts-namespaces-klibc-bit-sparc.patch
ipc-namespace-core.patch
readahead-sysctl-parameters-fix.patch
make-copy_from_user_inatomic-not-zero-the-tail-on-i386-vs-reiser4.patch
make-kmem_cache_destroy-return-void-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
reiser4-rename-generic_sounding_globalspatch-fix.patch
hpt3xx-rework-rate-filtering-tidy.patch
asus-mv-ide-device-ids.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-msi-only-build-msi-apicc-on-ia64-fix.patch
genirq-i386-irq-remove-the-msi-assumption-that-irq-==-vector.patch
genirq-x86_64-irq-make-vector_irq-per-cpu-fix.patch
genirq-x86_64-irq-make-vector_irq-per-cpu-warning-fix.patch
add-hypertransport-capability-defines-fix.patch
initial-generic-hypertransport-interrupt-support-Kconfig-fix.patch
srcu-report-out-of-memory-errors-fixlet.patch
nr_blockdev_pages-in_interrupt-warning.patch
device-suspend-debug.patch
slab-leaks3-default-y.patch
x86-kmap_atomic-debugging.patch
restore-rogue-readahead-printk.patch
input_register_device-debug.patch
put_bh-debug.patch
acpi_format_exception-debug.patch
jmicron-warning-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
