The patch titled
make pci/hotplug/acpiphp_glue.c:handle_hotplug_event_func() static
has been added to the -mm tree. Its filename is
acpiphp-use-new-dock-driver-fix.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
From: Adrian Bunk <bunk@xxxxxxxxx>
handle_hotplug_event_func() can now become static.
Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/pci/hotplug/acpiphp.h | 1 -
drivers/pci/hotplug/acpiphp_glue.c | 5 ++++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff -puN drivers/pci/hotplug/acpiphp_glue.c~acpiphp-use-new-dock-driver-fix drivers/pci/hotplug/acpiphp_glue.c
--- devel/drivers/pci/hotplug/acpiphp_glue.c~acpiphp-use-new-dock-driver-fix 2006-04-18 23:55:23.000000000 -0700
+++ devel-akpm/drivers/pci/hotplug/acpiphp_glue.c 2006-04-18 23:55:23.000000000 -0700
@@ -59,6 +59,8 @@ static LIST_HEAD(bridge_list);
static void handle_hotplug_event_bridge (acpi_handle, u32, void *);
static void acpiphp_sanitize_bus(struct pci_bus *bus);
static void acpiphp_set_hpp_values(acpi_handle handle, struct pci_bus *bus);
+static void handle_hotplug_event_func(acpi_handle handle, u32 type,
+ void *context);
/*
@@ -1386,7 +1388,8 @@ static void handle_hotplug_event_bridge(
* handles ACPI event notification on slots
*
*/
-void handle_hotplug_event_func(acpi_handle handle, u32 type, void *context)
+static void handle_hotplug_event_func(acpi_handle handle, u32 type,
+ void *context)
{
struct acpiphp_func *func;
char objname[64];
diff -puN drivers/pci/hotplug/acpiphp.h~acpiphp-use-new-dock-driver-fix drivers/pci/hotplug/acpiphp.h
--- devel/drivers/pci/hotplug/acpiphp.h~acpiphp-use-new-dock-driver-fix 2006-04-18 23:55:23.000000000 -0700
+++ devel-akpm/drivers/pci/hotplug/acpiphp.h 2006-04-18 23:55:23.000000000 -0700
@@ -198,7 +198,6 @@ extern int acpiphp_glue_init (void);
extern void acpiphp_glue_exit (void);
extern int acpiphp_get_num_slots (void);
typedef int (*acpiphp_callback)(struct acpiphp_slot *slot, void *data);
-void handle_hotplug_event_func(acpi_handle, u32, void*);
extern int acpiphp_enable_slot (struct acpiphp_slot *slot);
extern int acpiphp_disable_slot (struct acpiphp_slot *slot);
_
Patches currently in -mm which might be from bunk@xxxxxxxxx are
hugetlbfs-add-kconfig-help-text.patch
remove-the-obsolete-idepci_flag_force_pdc.patch
git-acpi.patch
acpiphp-use-new-dock-driver-fix.patch
git-dvb.patch
drivers-media-video-bt866c-small-fixes-2.patch
gregkh-i2c-w1-cleanups-fix.patch
git-intelfb.patch
nfs-make-2-functions-static.patch
fix-nfs-proc_fs=n-compile-error.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-gdthc-make-__gdth_execute-static.patch
drivers-scsi-qla2xxx-make-some-functions-static.patch
drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_done_with_status-static.patch
scsi-megaraid-megaraid_mmc-fix-a-null-pointer-dereference.patch
remove-drivers-scsi-constantscscsi_print_req_sense.patch
drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_match_scb-static.patch
ieee80211_wxc-remove-dead-code.patch
bcm43xx_phyc-fix-a-memory-leak.patch
memory_hotplugh-cleanup.patch
acx1xx-wireless-driver.patch
arch-i386-kernel-apicc-make-modern_apic-static.patch
drivers-acpi-busc-make-struct-acpi_sci_dir-static.patch
remove-fs-jffs2-ioctlc.patch
update-obsolete_oss_driver-schedule-and-dependencies.patch
make-the-oss-sound_via82cxxx-option-available-again.patch
fs-locksc-make-posix_locks_deadlock-static.patch
remove-config_parport_arc-drivers-parport-parport_arcc.patch
fs-fat-miscc-unexport-fat_sync_bhs.patch
the-scheduled-unexport-of-insert_resource.patch
time-i386-clocksource-drivers.patch
dlm-recovery.patch
dlm-build.patch
dlm-cleanup-unused-functions.patch
dlm-include-own-headers.patch
reiser4.patch
fs-reiser4-misc-cleanups.patch
nmi-lockup-and-altsysrq-p-dumping-calltraces-on-_all_-cpus.patch
slab-cache-shrinker-statistics.patch
i386-enable-4k-stacks-by-default.patch
mutex-subsystem-synchro-test-module.patch
drivers-char-ipmi-ipmi_msghandlerc-make-proc_ipmi_root-static.patch
drivers-message-i2o-iopc-unexport-i2o_msg_nop.patch
x86_64-unexport-ia32_sys_call_table.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
