The patch titled
remove kernel/lockdep.c:lockdep_internal
has been added to the -mm tree. Its filename is
remove-kernel-lockdepclockdep_internal.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: remove kernel/lockdep.c:lockdep_internal
From: Adrian Bunk <bunk@xxxxxxxxx>
Remove the no longer used lockdep_internal().
Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>
Acked-by: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/linux/lockdep.h | 6 ------
kernel/lockdep.c | 7 -------
2 files changed, 13 deletions(-)
diff -puN include/linux/lockdep.h~remove-kernel-lockdepclockdep_internal include/linux/lockdep.h
--- a/include/linux/lockdep.h~remove-kernel-lockdepclockdep_internal
+++ a/include/linux/lockdep.h
@@ -193,7 +193,6 @@ extern void lockdep_free_key_range(void
extern void lockdep_off(void);
extern void lockdep_on(void);
-extern int lockdep_internal(void);
/*
* These methods are used by specific locking variants (spinlocks,
@@ -255,11 +254,6 @@ static inline void lockdep_on(void)
{
}
-static inline int lockdep_internal(void)
-{
- return 0;
-}
-
# define lock_acquire(l, s, t, r, c, i) do { } while (0)
# define lock_release(l, n, i) do { } while (0)
# define lockdep_init() do { } while (0)
diff -puN kernel/lockdep.c~remove-kernel-lockdepclockdep_internal kernel/lockdep.c
--- a/kernel/lockdep.c~remove-kernel-lockdepclockdep_internal
+++ a/kernel/lockdep.c
@@ -140,13 +140,6 @@ void lockdep_on(void)
EXPORT_SYMBOL(lockdep_on);
-int lockdep_internal(void)
-{
- return current->lockdep_recursion != 0;
-}
-
-EXPORT_SYMBOL(lockdep_internal);
-
/*
* Debugging switches:
*/
_
Patches currently in -mm which might be from bunk@xxxxxxxxx are
origin.patch
drivers-rtc-rtc-rs5c372c-fix-a-null-dereference.patch
make-drivers-acpi-baycdrive_bays-static.patch
make-drivers-acpi-eccec_ecdt-static.patch
git-alsa.patch
tidy-gregkh-driver-udev-compatible-hack.patch
drivers-media-video-cafe_ccicc-make-a-function-static.patch
git-gfs2-nmw.patch
git-mtd.patch
git-net.patch
net-uninline-skb_put-fix.patch
git-ocfs2.patch
drivers-pci-hotplug-ibmphp_pcic-fix-null-dereference.patch
git-scsi-misc.patch
drivers-scsi-small-cleanups.patch
drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_match_scb-static.patch
drivers-scsi-advansysc-cleanups.patch
megaraid-fix-warnings-when-config_proc_fs=n.patch
drivers-scsi-dpt_i2oc-remove-dead-code.patch
git-cryptodev.patch
make-mm-thrashcglobal_faults-static.patch
acx1xx-wireless-driver.patch
drivers-edac-make-code-static.patch
remove-drivers-pci-searchcpci_find_device_reverse.patch
ext4_ext_split-remove-dead-code.patch
the-scheduled-removal-of-some-oss-options.patch
make-arch-i386-pci-commoncpci_bf_sort-static.patch
make-mm-shmemcshmem_xattr_security_handler-static.patch
remove-kernel-lockdepclockdep_internal.patch
fs-reiser4-possible-cleanups.patch
reiser4-possible-cleanups-2.patch
make-drivers-md-dm-snapcksnapd-static.patch
gtod-persistent-clock-support-i386-i386-unexport-read_persistent_clock.patch
updated-i386-convert-to-clock-event-devices-arch-i386-kernel-apicc-make-a-function-static.patch
updated-i386-convert-to-clock-event-devices-remove-arch-i386-kernel-time_hpetchpet_reenable.patch
slim-main-patch-security-slim-slm_mainc-make-2-functions-static.patch
slab-cache-shrinker-statistics.patch
debug-shared-irqs-kconfig-fix.patch
i386-enable-4k-stacks-by-default.patch
mutex-subsystem-synchro-test-module.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
