The patch titled make variables static after klibc merge has been added to the -mm tree. Its filename is make-variables-static-after-klibc-merge.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: make variables static after klibc merge From: Adrian Bunk <bunk@xxxxxxxxx> We can now make the following variables static: - drivers/md/md.c: mdp_major - init/main.c: envp_init[] Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- drivers/md/md.c | 2 +- init/main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff -puN drivers/md/md.c~make-variables-static-after-klibc-merge drivers/md/md.c --- a/drivers/md/md.c~make-variables-static-after-klibc-merge +++ a/drivers/md/md.c @@ -2883,7 +2883,7 @@ static struct kobj_type md_ktype = { .default_attrs = md_default_attrs, }; -int mdp_major = 0; +static int mdp_major = 0; static struct kobject *md_probe(dev_t dev, int *part, void *data) { diff -puN init/main.c~make-variables-static-after-klibc-merge init/main.c --- a/init/main.c~make-variables-static-after-klibc-merge +++ a/init/main.c @@ -160,7 +160,7 @@ static int __init maxcpus(char *str) __setup("maxcpus=", maxcpus); static char * argv_init[MAX_INIT_ARGS+2] = { "init", NULL, }; -char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, }; +static char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, }; static const char *panic_later, *panic_param; extern struct obs_kernel_param __setup_start[], __setup_end[]; _ Patches currently in -mm which might be from bunk@xxxxxxxxx are origin.patch time-i386-clocksource-drivers.patch fbdev-cleanup-the-config_video_select-mess.patch fbdev-remove-duplicate-includes.patch fbdev-remove-unused-exports.patch md-make-md_print_devices-static.patch drivers-md-mdc-make-code-static.patch acpiphp-use-new-dock-driver.patch drivers-acpi-scanc-make-acpi_bus_type-static.patch git-agpgart.patch the-scheduled-unexport-of-insert_resource.patch git-dvb.patch git-gfs2.patch make-variables-static-after-klibc-merge.patch make-drivers-scsi-pata_pcmciacpcmcia_remove_one-static.patch make-drivers-scsi-pata_it821xcit821x_passthru_dev_select-static.patch ni5010-netcard-cleanup-fix.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 if-0-drivers-usb-input-hid-corechid_find_field_by_usage.patch acx1xx-wireless-driver.patch fs-bufferc-possible-cleanups.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 drivers-char-ipmi-ipmi_msghandlerc-make-proc_ipmi_root-static.patch drivers-message-i2o-iopc-unexport-i2o_msg_nop.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