The patch titled
kernel/lockdep.c: possible cleanups
has been added to the -mm tree. Its filename is
lockdep-core-cleanups.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: kernel/lockdep.c: possible cleanups
From: Adrian Bunk <bunk@xxxxxxxxx>
- make the needlessly global variable lockdep_init_error static
- make the needlessly global lockdep_print_held_locks() static
- #if 0 the unused global print_lock_classes()
(this also implies to #if 0 some static functions)
Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/linux/lockdep.h | 5 -----
kernel/lockdep.c | 10 ++++++++--
kernel/lockdep_internals.h | 7 -------
3 files changed, 8 insertions(+), 14 deletions(-)
diff -puN include/linux/lockdep.h~lockdep-core-cleanups include/linux/lockdep.h
--- a/include/linux/lockdep.h~lockdep-core-cleanups
+++ a/include/linux/lockdep.h
@@ -191,9 +191,6 @@ extern void lockdep_reset(void);
extern void lockdep_reset_lock(struct lockdep_map *lock);
extern void lockdep_free_key_range(void *start, unsigned long size);
-extern void print_lock_classes(void);
-extern void lockdep_print_held_locks(struct task_struct *task);
-
extern void lockdep_off(void);
extern void lockdep_on(void);
extern int lockdep_internal(void);
@@ -258,8 +255,6 @@ static inline int lockdep_internal(void)
# define lock_release(l, n, i) do { } while (0)
# define lockdep_init() do { } while (0)
# define lockdep_info() do { } while (0)
-# define print_lock_classes() do { } while (0)
-# define lockdep_print_held_locks(task) do { (void)(task); } while (0)
# define lockdep_init_map(lock, name, key) do { } while (0)
# define lockdep_set_class(lock, key) do { (void)(key); } while (0)
# define INIT_LOCKDEP
diff -puN kernel/lockdep.c~lockdep-core-cleanups kernel/lockdep.c
--- a/kernel/lockdep.c~lockdep-core-cleanups
+++ a/kernel/lockdep.c
@@ -262,7 +262,7 @@ unsigned int max_recursion_depth;
* might work. So we mark any initialization errors and printk
* about it later on, in lockdep_info().
*/
-int lockdep_init_error;
+static int lockdep_init_error;
/*
* Various lockdep statistics:
@@ -373,6 +373,7 @@ static void print_lock_name(struct lock_
printk("){%c%c%c%c}", c1, c2, c3, c4);
}
+#if 0
static void print_lock_name_field(struct lock_class *class)
{
const char *name;
@@ -390,6 +391,7 @@ static void print_lock_name_field(struct
printk("/%d", class->subclass);
}
}
+#endif /* 0 */
static void print_lockdep_cache(struct lockdep_map *lock)
{
@@ -410,7 +412,7 @@ static void print_lock(struct held_lock
print_ip_sym(hlock->acquire_ip);
}
-void lockdep_print_held_locks(struct task_struct *curr)
+static void lockdep_print_held_locks(struct task_struct *curr)
{
int i, depth = curr->lockdep_depth;
@@ -488,6 +490,8 @@ static void print_lock_dependencies(stru
}
}
+#if 0
+
/*
* printk all locks that are taken after this lock:
*/
@@ -539,6 +543,8 @@ void print_lock_classes(void)
}
}
+#endif /* 0 */
+
/*
* Add a new dependency to the head of the list:
*/
diff -puN kernel/lockdep_internals.h~lockdep-core-cleanups kernel/lockdep_internals.h
--- a/kernel/lockdep_internals.h~lockdep-core-cleanups
+++ a/kernel/lockdep_internals.h
@@ -49,13 +49,6 @@ extern unsigned int max_recursion_depth;
#ifdef CONFIG_DEBUG_LOCKDEP
/*
- * We cannot printk in early bootup code. Not even early_printk()
- * might work. So we mark any initialization errors and printk
- * about it later on, in lockdep_info().
- */
-extern int lockdep_init_error;
-
-/*
* Various lockdep statistics:
*/
extern atomic_t chain_lookup_hits;
_
Patches currently in -mm which might be from bunk@xxxxxxxxx are
origin.patch
fix-sgivwfb-compile.patch
git-acpi.patch
drivers-acpi-scanc-make-acpi_bus_type-static.patch
git-agpgart.patch
the-scheduled-unexport-of-insert_resource.patch
git-gfs2.patch
make-variables-static-after-klibc-merge.patch
git-libata-all.patch
fs-jffs2-make-2-functions-static.patch
ni5010-netcard-cleanup-fix.patch
drivers-dma-iovlockc-make-num_pages_spanned-static.patch
drivers-net-irda-mcs7780c-make-struct-mcs_driver-static.patch
git-ocfs2.patch
gregkh-pci-acpiphp-configure-_prt-v3-cleanup.patch
drivers-scsi-aic7xxx-possible-cleanups.patch
drivers-scsi-small-cleanups.patch
drivers-scsi-megaraidc-add-a-dummy-mega_create_proc_entry-for-proc_fs=y.patch
drivers-scsi-qla2xxx-make-some-functions-static.patch
drivers-scsi-qla2xxx-make-more-some-functions-static.patch
drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_done_with_status-static.patch
drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_match_scb-static.patch
drivers-scsi-aic7xxx-possible-cleanups-2.patch
drivers-scsi-arcmsr-cleanups.patch
drivers-scsi-advansysc-cleanups.patch
make-drivers-scsi-aic7xxx-aic79xx_coreahd_set_tags-static.patch
if-0-drivers-usb-input-hid-corechid_find_field_by_usage.patch
acx1xx-wireless-driver.patch
arch-i386-mach-visws-setupc-remove-dummy-function-calls.patch
make-kernel-sysctlc_proc_do_string-static.patch
namespaces-utsname-implement-clone_newuts-flag-tidy.patch
task-watchers-register-semundo-task-watcher-cleanup.patch
fs-reiser4-possible-cleanups.patch
drivers-ide-legacy-ide-csc-make-2-functions-static.patch
drivers-md-raid5c-remove-an-unused-variable.patch
lockdep-core-cleanups.patch
srcu-add-srcu-operations-to-rcutorture-tidy-2.patch
slab-cache-shrinker-statistics.patch
i386-enable-4k-stacks-by-default.patch
mutex-subsystem-synchro-test-module.patch
fs-ecryptfs-possible-cleanups.patch
re-add-config_sound_sscape.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
