The patch titled
lockdep-hack-around-build-errors
has been added to the -mm tree. Its filename is
lockdep-hack-around-build-errors.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: lockdep-hack-around-build-errors
From: Andrew Morton <akpm@xxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/s390/net/qeth_main.c | 4 ++++
fs/ntfs/inode.c | 19 +++++++++++++++++--
fs/ntfs/super.c | 26 +++++++++++++++++++++++---
net/unix/af_unix.c | 5 ++++-
4 files changed, 48 insertions(+), 6 deletions(-)
diff -puN fs/ntfs/inode.c~lockdep-hack-around-build-errors fs/ntfs/inode.c
--- a/fs/ntfs/inode.c~lockdep-hack-around-build-errors
+++ a/fs/ntfs/inode.c
@@ -371,7 +371,9 @@ static void ntfs_destroy_extent_inode(nt
* The attribute runlist lock has separate locking rules from the
* normal runlist lock, so split the two lock-types:
*/
+#ifdef CONFIG_DEBUG_RWSEM_ALLOC
static struct lockdep_type_key attr_list_rl_lock_type;
+#endif
/**
* __ntfs_init_inode - initialize ntfs specific part of an inode
@@ -400,8 +402,10 @@ void __ntfs_init_inode(struct super_bloc
ni->attr_list_size = 0;
ni->attr_list = NULL;
ntfs_init_runlist(&ni->attr_list_rl);
+#ifdef CONFIG_DEBUG_RWSEM_ALLOC
lockdep_reinit_key(&ni->attr_list_rl.lock,
&attr_list_rl_lock_type);
+#endif
ni->itype.index.bmp_ino = NULL;
ni->itype.index.block_size = 0;
ni->itype.index.vcn_size = 0;
@@ -428,7 +432,9 @@ inline ntfs_inode *ntfs_new_extent_inode
ntfs_debug("Entering.");
if (likely(ni != NULL)) {
__ntfs_init_inode(sb, ni);
+#ifdef CONFIG_DEBUG_MUTEX_ALLOC
lockdep_reinit_key(&ni->mrec_lock, &extent_inode_mrec_lock_key);
+#endif
ni->mft_no = mft_no;
ni->type = AT_UNUSED;
ni->name = NULL;
@@ -1745,7 +1751,13 @@ err_out:
* accessed from the VFS side (or even internally), only by the
* map_mft functions.
*/
-static struct lockdep_type_key mft_ni_runlist_lock_key, mft_ni_mrec_lock_key;
+#ifdef CONFIG_DEBUG_RWSEM_ALLOC
+static struct lockdep_type_key mft_ni_runlist_lock_key;
+#endif
+
+#ifdef CONFIG_DEBUG_MUTEX_ALLOC
+static struct lockdep_type_key mft_ni_mrec_lock_key;
+#endif
/**
* ntfs_read_inode_mount - special read_inode for mount time use only
@@ -2178,9 +2190,12 @@ int ntfs_read_inode_mount(struct inode *
* Split the locking rules of the MFT inode from the
* locking rules of other inodes:
*/
+#ifdef CONFIG_DEBUG_RWSEM_ALLOC
lockdep_reinit_key(&ni->runlist.lock, &mft_ni_runlist_lock_key);
+#endif
+#ifdef CONFIG_DEBUG_MUTEX_ALLOC
lockdep_reinit_key(&ni->mrec_lock, &mft_ni_mrec_lock_key);
-
+#endif
return 0;
em_put_err_out:
diff -puN drivers/s390/net/qeth_main.c~lockdep-hack-around-build-errors drivers/s390/net/qeth_main.c
--- a/drivers/s390/net/qeth_main.c~lockdep-hack-around-build-errors
+++ a/drivers/s390/net/qeth_main.c
@@ -3232,9 +3232,11 @@ qeth_alloc_qdio_buffers(struct qeth_card
&card->qdio.out_qs[i]->qdio_bufs[j];
skb_queue_head_init(&card->qdio.out_qs[i]->bufs[j].
skb_list);
+#ifdef CONFIG_DEBUG_SPINLOCK_ALLOC
lockdep_reinit_key(
&card->qdio.out_qs[i]->bufs[j].skb_list.lock,
&qdio_out_skb_queue_key);
+#endif
INIT_LIST_HEAD(&card->qdio.out_qs[i]->bufs[j].ctx_list);
}
}
@@ -5280,7 +5282,9 @@ qeth_free_vlan_buffer(struct qeth_card *
struct sk_buff_head tmp_list;
skb_queue_head_init(&tmp_list);
+#ifdef CONFIG_DEBUG_SPINLOCK_ALLOC
lockdep_reinit_key(&tmp_list.lock, &qdio_out_skb_queue_key);
+#endif
for(i = 0; i < QETH_MAX_BUFFER_ELEMENTS(card); ++i){
while ((skb = skb_dequeue(&buf->skb_list))){
if (vlan_tx_tag_present(skb) &&
diff -puN fs/ntfs/super.c~lockdep-hack-around-build-errors fs/ntfs/super.c
--- a/fs/ntfs/super.c~lockdep-hack-around-build-errors
+++ a/fs/ntfs/super.c
@@ -1728,9 +1728,21 @@ upcase_failed:
* The lcn and mft bitmap inodes are NTFS-internal inodes with
* their own special locking rules:
*/
-static struct lockdep_type_key
- lcnbmp_runlist_lock_key, lcnbmp_mrec_lock_key,
- mftbmp_runlist_lock_key, mftbmp_mrec_lock_key;
+#ifdef CONFIG_DEBUG_RWSEM_ALLOC
+static struct lockdep_type_key lcnbmp_runlist_lock_key;
+#endif
+
+#ifdef CONFIG_DEBUG_MUTEX_ALLOC
+static struct lockdep_type_key lcnbmp_mrec_lock_key;
+#endif
+
+#ifdef CONFIG_DEBUG_RWSEM_ALLOC
+static struct lockdep_type_key mftbmp_runlist_lock_key;
+#endif
+
+#ifdef CONFIG_DEBUG_MUTEX_ALLOC
+static struct lockdep_type_key mftbmp_mrec_lock_key;
+#endif
/**
* load_system_files - open the system files using normal functions
@@ -1788,10 +1800,14 @@ static BOOL load_system_files(ntfs_volum
ntfs_error(sb, "Failed to load $MFT/$BITMAP attribute.");
goto iput_mirr_err_out;
}
+#ifdef CONFIG_DEBUG_RWSEM_ALLOC
lockdep_reinit_key(&NTFS_I(vol->mftbmp_ino)->runlist.lock,
&mftbmp_runlist_lock_key);
+#endif
+#ifdef CONFIG_DEBUG_MUTEX_ALLOC
lockdep_reinit_key(&NTFS_I(vol->mftbmp_ino)->mrec_lock,
&mftbmp_mrec_lock_key);
+#endif
/* Read upcase table and setup @vol->upcase and @vol->upcase_len. */
if (!load_and_init_upcase(vol))
goto iput_mftbmp_err_out;
@@ -1814,10 +1830,14 @@ static BOOL load_system_files(ntfs_volum
iput(vol->lcnbmp_ino);
goto bitmap_failed;
}
+#ifdef CONFIG_DEBUG_RWSEM_ALLOC
lockdep_reinit_key(&NTFS_I(vol->lcnbmp_ino)->runlist.lock,
&lcnbmp_runlist_lock_key);
+#endif
+#ifdef CONFIG_DEBUG_MUTEX_ALLOC
lockdep_reinit_key(&NTFS_I(vol->lcnbmp_ino)->mrec_lock,
&lcnbmp_mrec_lock_key);
+#endif
NInoSetSparseDisabled(NTFS_I(vol->lcnbmp_ino));
if ((vol->nr_clusters + 7) >> 3 > i_size_read(vol->lcnbmp_ino)) {
diff -puN net/unix/af_unix.c~lockdep-hack-around-build-errors net/unix/af_unix.c
--- a/net/unix/af_unix.c~lockdep-hack-around-build-errors
+++ a/net/unix/af_unix.c
@@ -548,7 +548,9 @@ static struct proto unix_proto = {
* bh-unsafe locking for their sk_receive_queue.lock. Split off
* this special lock-type by reinitializing the spinlock key:
*/
+#ifdef CONFIG_DEBUG_SPINLOCK_ALLOC
static struct lockdep_type_key af_unix_sk_receive_queue_lock_key;
+#endif
static struct sock * unix_create1(struct socket *sock)
{
@@ -565,9 +567,10 @@ static struct sock * unix_create1(struct
atomic_inc(&unix_nr_socks);
sock_init_data(sock,sk);
+#ifdef CONFIG_DEBUG_SPINLOCK_ALLOC
lockdep_reinit_key(&sk->sk_receive_queue.lock,
&af_unix_sk_receive_queue_lock_key);
-
+#endif
sk->sk_write_space = unix_write_space;
sk->sk_max_ack_backlog = sysctl_unix_max_dgram_qlen;
sk->sk_destruct = unix_sock_destructor;
_
Patches currently in -mm which might be from akpm@xxxxxxxx are
origin.patch
suspend_console-warning-fix.patch
myri10ge-build-fix.patch
revert-powernow-k8-crash-workaround.patch
git-acpi-pre.patch
git-acpi.patch
git-acpi-post.patch
git-acpi-fixup.patch
reapply-powernow-k8-crash-workaround.patch
acpi-update-asus_acpi-driver-registration-fix.patch
catch-notification-of-memory-add-event-of-acpi-via-container-driver-register-start-func-for-memory-device.patch
catch-notification-of-memory-add-event-of-acpi-via-container-driveravoid-redundant-call-add_memory.patch
remove-for_each_cpu.patch
sony_apci-resume.patch
kauditd_thread-warning-fix.patch
git-block.patch
git-cifs.patch
git-dvb.patch
tea575x-tuner-build-fix.patch
git-dvb-versus-matroxfb.patch
git-dvb-printk-warning-fix.patch
i2c-801-64bit-resource-fix.patch
git-gfs2.patch
git-infiniband.patch
git-infiniband-fixup.patch
git-input.patch
git-kbuild.patch
revert-sparc-build-breakage.patch
git-klibc.patch
git-klibc-fixup.patch
git-hdrcleanup-vs-git-klibc-on-ia64.patch
git-hdrcleanup-vs-git-klibc-on-ia64-2.patch
git-hdrinstall-fixup.patch
git-libata-all.patch
git-libata-all-fixup.patch
git-libata-all-data_xfer-fixes.patch
libata-reduce-timeouts.patch
via-pata-fails-on-some-atapi-drives-tidy.patch
git-netdev-all.patch
forcedeth-typecast-cleanup.patch
atm-mpcc-warning-fix.patch
git-nfs-fixup.patch
git-nfs-build-fixes.patch
nfs-build-fix-99.patch
git-powerpc.patch
serial-8250-sysrq-deadlock-fix.patch
revert-gregkh-pci-pci-test-that-drivers-properly-call-pci_set_master.patch
64-bit-resources-lose-some-ifdefs.patch
clear-abnormal-poweroff-flag-on-via-southbridges-fix-resume-fix.patch
areca-raid-linux-scsi-driver.patch
git-scsi-target-fixup.patch
usb-move-linux-usb_input.h-to-linux-usb-input-fix.patch
ipaqc-timing-parameters-fix.patch
git-supertrak-fixup.patch
revert-x86_64-mm-twofish-cipher---x86_64-assembler.patch
revert-x86_64-mm-twofish-cipher---i586-assembler.patch
revert-x86_64-mm-twofish-cipher---priority-fix.patch
revert-x86_64-mm-twofish-cipher---split-out-common-c-code.patch
x86_64-mm-moving-phys_proc_id-and-cpu_core_id-to-cpuinfo_x86-warning-fix.patch
git-xfs.patch
pg_uncached-is-ia64-only.patch
pgdat-allocation-for-new-node-add-export-kswapd-start-func-fix.patch
fix-update_mmu_cache-in-fremapc-fix.patch
initialise-total_memory-earlier.patch
page-migration-simplify-migrate_pages.patch
page-migration-support-moving-of-individual-pages-x86-support.patch
radix-tree-rcu-lockless-readside-wraning-fix.patch
radix-tree-rcu-lockless-readside-fix.patch
acx1xx-wireless-driver.patch
tiacx-pci-build-fix.patch
tiacx-ia64-fix.patch
x86-kernel-irq-balancer-fix-tidy.patch
i386-moving-phys_proc_id-and-cpu_core_id-to-cpuinfo_x86-warning-fix.patch
vdso-randomize-the-i386-vdso-by-moving-it-into-a-vma-tidy.patch
vdso-randomize-the-i386-vdso-by-moving-it-into-a-vma-arch_vma_name-fix.patch
vdso-randomize-the-i386-vdso-by-moving-it-into-a-vma-vs-x86_64-mm-reliable-stack-trace-support-i386.patch
vdso-randomize-the-i386-vdso-by-moving-it-into-a-vma-vs-x86_64-mm-reliable-stack-trace-support-i386-2.patch
vdso-randomize-the-i386-vdso-by-moving-it-into-a-vma-vs-x86_64-mm-reliable-stack-trace-support-i386-2-revert-maxmem-change.patch
prune_one_dentry-tweaks.patch
mmput-might-sleep.patch
jbd-avoid-kfree-null.patch
ext3_clear_inode-avoid-kfree-null.patch
leds-amstrad-delta-led-support-tidy.patch
connector-exports.patch
config_net=n-build-fix.patch
rewritten-backlight-infrastructure-for-portable-apple-computers-fix.patch
deprecate-smbfs-in-favour-of-cifs.patch
ufs-printk-warning-fixes.patch
msnd-section-fix.patch
openpromfs-factorize-out-tidy.patch
add-driver-for-arm-amba-pl031-rtc-fix.patch
add-export_unused_symbol-and-export_unused_symbol_gpl-default.patch
kernel-sysc-cleanups-fix.patch
cpqarray-section-fix.patch
pdflush-handle-resume-wakeups.patch
schedule_on_each_cpu-reduce-kmalloc-size.patch
load_module-cleanup.patch
ax88796-parallel-port-driver-build-fix.patch
for_each_cpu_mask-warning-fix.patch
add-max6902-rtc-support-tidy.patch
add-v3020-rtc-support-tidy.patch
at91rm9200-rtc-driver-tidy.patch
readahead-backoff-on-i-o-error-tweaks.patch
cyclades-cleanup-cleanup.patch
fuse-add-control-filesystem-printk-fix.patch
kthread-update-loopc-to-use-kthread-fix.patch
kthread-convert-smbiod-tidy.patch
kthread-convert-stop_machine-into-a-kthread.patch
stop-on-cpu-lost-tidy.patch
fix-bounds-check-in-vsnprintf-to-allow-for-a-0-size-and-tidy.patch
irda-usb-printk-fix.patch
reiserfs-on-demand-bitmap-loading-fix.patch
per-task-delay-accounting-proc-export-of-aggregated-block-i-o-delays-warning-fix.patch
add-via-hw-rng-driver-fix.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
mark-address_space_operations-const-vs-ecryptfs-mmap-operations.patch
ecryptfs-alpha-build-fix.patch
ecryptfs-more-elegant-aes-key-size-manipulation-tidy.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
ide_dma_speed-fixes-warning-fix.patch
ide_dma_speed-fixes-tidy.patch
hpt3xx-rework-rate-filtering-tidy.patch
hpt370-clean-up-dma-timeout-handling-cleanup.patch
savagefb-add-state-save-and_restore-hooks-tidy.patch
au1100fb-add-power-management-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-convert-the-i386-architecture-to-irq-chips-fix-2.patch
lock-validator-beautify-x86_64-stacktraces-fix.patch
lock-validator-beautify-x86_64-stacktraces-fix-4.patch
lock-validator-stacktrace-build-fix.patch
lock-validator-stacktrace-warning-fix.patch
lock-validator-irqtrace-core-powerpc-fix-1.patch
lock-validator-irqtrace-core-non-x86-fix.patch
lock-validator-irqtrace-core-non-x86-fix-2.patch
lock-validator-irqtrace-core-non-x86-fix-3.patch
lock-validator-add-per_cpu_offset-fix.patch
lock-validator-core-multichar-fix.patch
lock-validator-prove-rwsem-locking-correctness-fix.patch
lock-validator-prove-rwsem-locking-correctness-powerpc-fix.patch
lock-validator-special-locking-serial-fix.patch
lock-validator-special-locking-af_unix-undo-af_unix-_bh-locking-changes-and-split-lock-type-fix.patch
lock-validator-special-locking-sb-s_umount-fix.patch
lock-validator-enable-lock-validator-in-kconfig-not-yet.patch
lockdep-x86-only.patch
lockdep-really-x86-only.patch
lockdep-really-really-x86-only.patch
kgdb-core-lite-add-reboot-command.patch
kgdb-8250-fix.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
lockdep-hack-around-build-errors.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
