* [2.6 patch] kill acpi_ksyms.c
2004-11-08 17:01 ` Len Brown
@ 2004-11-09 1:40 ` Adrian Bunk
2004-11-12 4:56 ` Len Brown
2004-11-10 1:21 ` [2.6 patch] drivers/acpi: #ifdef unused functions away Adrian Bunk
1 sibling, 1 reply; 19+ messages in thread
From: Adrian Bunk @ 2004-11-09 1:40 UTC (permalink / raw)
To: Len Brown; +Cc: Arnaldo Carvalho de Melo, ACPI Developers, linux-kernel
On Mon, Nov 08, 2004 at 12:01:03PM -0500, Len Brown wrote:
> Thanks for the suggestion.
>
> I'd certainly accept patches using ACPI_FUTURE_USAGE and moving
> EXPORT_KSYMS to where they're more easily tracked.
>
> If the motivation is kernel static size reduction, then I'll be
> interested in seeing a before/after kernel size measurements.
Static size reduction is an important reason.
I'll send you the measurements when I'll have a patch ready.
Below is as a preparation a patch that removes acpi_ksyms.c .
It shouldn't make any practical difference.
The function acpi_db_user_commands that wasn't available in the whole
kernel sources was EXPORT_SYMBOL'ed. The patch removes this bogus
export.
diffstat output:
drivers/acpi/Makefile | 2
drivers/acpi/acpi_ksyms.c | 165 ------------------------------
drivers/acpi/bus.c | 10 +
drivers/acpi/ec.c | 2
drivers/acpi/events/evxface.c | 10 +
drivers/acpi/events/evxfevnt.c | 8 +
drivers/acpi/events/evxfregn.c | 4
drivers/acpi/hardware/hwregs.c | 4
drivers/acpi/hardware/hwsleep.c | 4
drivers/acpi/hardware/hwtimer.c | 5
drivers/acpi/namespace/nsxfeval.c | 4
drivers/acpi/namespace/nsxfname.c | 4
drivers/acpi/namespace/nsxfobj.c | 5
drivers/acpi/osl.c | 18 +++
drivers/acpi/pci_irq.c | 2
drivers/acpi/pci_root.c | 2
drivers/acpi/resources/rsxface.c | 7 +
drivers/acpi/scan.c | 6 -
drivers/acpi/tables/tbconvrt.c | 2
drivers/acpi/tables/tbxface.c | 3
drivers/acpi/tables/tbxfroot.c | 2
drivers/acpi/utilities/utdebug.c | 7 +
drivers/acpi/utilities/utglobal.c | 4
drivers/acpi/utilities/utxface.c | 2
drivers/acpi/utils.c | 4
include/acpi/acdebug.h | 5
26 files changed, 112 insertions(+), 179 deletions(-)
Signed-off-by: Adrian Bunk <bunk@stusta.de>
--- linux-2.6.10-rc1-mm3-full/include/acpi/acdebug.h.old 2004-11-09 00:58:10.000000000 +0100
+++ linux-2.6.10-rc1-mm3-full/include/acpi/acdebug.h 2004-11-09 00:58:18.000000000 +0100
@@ -386,11 +386,6 @@
acpi_db_execute_thread (
void *context);
-acpi_status
-acpi_db_user_commands (
- char prompt,
- union acpi_parse_object *op);
-
void
acpi_db_display_help (
char *help_type);
--- linux-2.6.10-rc1-mm3-full/drivers/acpi/osl.c.old 2004-11-09 00:55:43.000000000 +0100
+++ linux-2.6.10-rc1-mm3-full/drivers/acpi/osl.c 2004-11-09 01:28:54.000000000 +0100
@@ -26,6 +26,7 @@
*/
#include <linux/config.h>
+#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/slab.h>
#include <linux/mm.h>
@@ -61,8 +62,11 @@
#ifdef ENABLE_DEBUGGER
#include <linux/kdb.h>
+
/* stuff for debugger support */
int acpi_in_debugger;
+EXPORT_SYMBOL(acpi_in_debugger);
+
extern char line_buf[80];
#endif /*ENABLE_DEBUGGER*/
@@ -117,6 +121,7 @@
acpi_os_vprintf(fmt, args);
va_end(args);
}
+EXPORT_SYMBOL(acpi_os_printf);
void
acpi_os_vprintf(const char *fmt, va_list args)
@@ -147,6 +152,7 @@
{
kfree(ptr);
}
+EXPORT_SYMBOL(acpi_os_free);
acpi_status
acpi_os_get_root_pointer(u32 flags, struct acpi_pointer *addr)
@@ -311,6 +317,7 @@
current->state = TASK_INTERRUPTIBLE;
schedule_timeout(((signed long) ms * HZ) / 1000);
}
+EXPORT_SYMBOL(acpi_os_sleep);
void
acpi_os_stall(u32 us)
@@ -325,6 +332,7 @@
us -= delay;
}
}
+EXPORT_SYMBOL(acpi_os_stall);
/*
* Support ACPI 3.0 AML Timer operand
@@ -377,6 +385,7 @@
return AE_OK;
}
+EXPORT_SYMBOL(acpi_os_read_port);
acpi_status
acpi_os_write_port(
@@ -401,6 +410,7 @@
return AE_OK;
}
+EXPORT_SYMBOL(acpi_os_write_port);
acpi_status
acpi_os_read_memory(
@@ -519,6 +529,7 @@
return (result ? AE_ERROR : AE_OK);
}
+EXPORT_SYMBOL(acpi_os_read_pci_configuration);
acpi_status
acpi_os_write_pci_configuration (struct acpi_pci_id *pci_id, u32 reg, acpi_integer value, u32 width)
@@ -712,6 +723,7 @@
return_ACPI_STATUS (status);
}
+EXPORT_SYMBOL(acpi_os_queue_for_execution);
void
acpi_os_wait_events_complete(
@@ -719,6 +731,7 @@
{
flush_workqueue(kacpid_wq);
}
+EXPORT_SYMBOL(acpi_os_wait_events_complete);
/*
* Allocate the memory for a spinlock and initialize it.
@@ -830,6 +843,7 @@
return_ACPI_STATUS (AE_OK);
}
+EXPORT_SYMBOL(acpi_os_create_semaphore);
/*
@@ -856,6 +870,7 @@
return_ACPI_STATUS (AE_OK);
}
+EXPORT_SYMBOL(acpi_os_delete_semaphore);
/*
@@ -945,6 +960,7 @@
return_ACPI_STATUS (status);
}
+EXPORT_SYMBOL(acpi_os_wait_semaphore);
/*
@@ -971,6 +987,7 @@
return_ACPI_STATUS (AE_OK);
}
+EXPORT_SYMBOL(acpi_os_signal_semaphore);
u32
acpi_os_get_line(char *buffer)
@@ -1045,6 +1062,7 @@
return AE_OK;
}
+EXPORT_SYMBOL(acpi_os_signal);
int __init
acpi_os_name_setup(char *str)
--- linux-2.6.10-rc1-mm3-full/drivers/acpi/utilities/utglobal.c.old 2004-11-09 00:59:29.000000000 +0100
+++ linux-2.6.10-rc1-mm3-full/drivers/acpi/utilities/utglobal.c 2004-11-09 01:11:56.000000000 +0100
@@ -43,6 +43,8 @@
#define DEFINE_ACPI_GLOBALS
+#include <linux/module.h>
+
#include <acpi/acpi.h>
#include <acpi/acnamesp.h>
@@ -143,10 +145,12 @@
/* Debug switch - level and trace mask */
u32 acpi_dbg_level = ACPI_DEBUG_DEFAULT;
+EXPORT_SYMBOL(acpi_dbg_level);
/* Debug switch - layer (component) mask */
u32 acpi_dbg_layer = ACPI_COMPONENT_DEFAULT | ACPI_ALL_DRIVERS;
+EXPORT_SYMBOL(acpi_dbg_layer);
u32 acpi_gbl_nesting_level = 0;
--- linux-2.6.10-rc1-mm3-full/drivers/acpi/utilities/utdebug.c.old 2004-11-09 01:00:15.000000000 +0100
+++ linux-2.6.10-rc1-mm3-full/drivers/acpi/utilities/utdebug.c 2004-11-09 01:12:33.000000000 +0100
@@ -41,6 +41,7 @@
* POSSIBILITY OF SUCH DAMAGES.
*/
+#include <linux/module.h>
#include <acpi/acpi.h>
@@ -178,6 +179,7 @@
va_start (args, format);
acpi_os_vprintf (format, args);
}
+EXPORT_SYMBOL(acpi_ut_debug_print);
/*****************************************************************************
@@ -219,6 +221,7 @@
va_start (args, format);
acpi_os_vprintf (format, args);
}
+EXPORT_SYMBOL(acpi_ut_debug_print_raw);
/*****************************************************************************
@@ -250,6 +253,7 @@
acpi_ut_debug_print (ACPI_LV_FUNCTIONS, line_number, dbg_info,
"%s\n", acpi_gbl_fn_entry_str);
}
+EXPORT_SYMBOL(acpi_ut_trace);
/*****************************************************************************
@@ -378,6 +382,7 @@
acpi_gbl_nesting_level--;
}
+EXPORT_SYMBOL(acpi_ut_exit);
/*****************************************************************************
@@ -418,6 +423,7 @@
acpi_gbl_nesting_level--;
}
+EXPORT_SYMBOL(acpi_ut_status_exit);
/*****************************************************************************
@@ -451,6 +457,7 @@
acpi_gbl_nesting_level--;
}
+EXPORT_SYMBOL(acpi_ut_value_exit);
/*****************************************************************************
--- linux-2.6.10-rc1-mm3-full/drivers/acpi/namespace/nsxfname.c.old 2004-11-09 01:02:20.000000000 +0100
+++ linux-2.6.10-rc1-mm3-full/drivers/acpi/namespace/nsxfname.c 2004-11-09 01:12:41.000000000 +0100
@@ -42,6 +42,7 @@
* POSSIBILITY OF SUCH DAMAGES.
*/
+#include <linux/module.h>
#include <acpi/acpi.h>
#include <acpi/acnamesp.h>
@@ -129,6 +130,7 @@
return (status);
}
+EXPORT_SYMBOL(acpi_get_handle);
/******************************************************************************
@@ -210,6 +212,7 @@
(void) acpi_ut_release_mutex (ACPI_MTX_NAMESPACE);
return (status);
}
+EXPORT_SYMBOL(acpi_get_name);
/******************************************************************************
@@ -359,4 +362,5 @@
}
return (status);
}
+EXPORT_SYMBOL(acpi_get_object_info);
--- linux-2.6.10-rc1-mm3-full/drivers/acpi/namespace/nsxfobj.c.old 2004-11-09 01:03:33.000000000 +0100
+++ linux-2.6.10-rc1-mm3-full/drivers/acpi/namespace/nsxfobj.c 2004-11-09 01:12:46.000000000 +0100
@@ -42,6 +42,7 @@
* POSSIBILITY OF SUCH DAMAGES.
*/
+#include <linux/module.h>
#include <acpi/acpi.h>
#include <acpi/acnamesp.h>
@@ -106,6 +107,7 @@
status = acpi_ut_release_mutex (ACPI_MTX_NAMESPACE);
return (status);
}
+EXPORT_SYMBOL(acpi_get_type);
/*******************************************************************************
@@ -171,6 +173,7 @@
(void) acpi_ut_release_mutex (ACPI_MTX_NAMESPACE);
return (status);
}
+EXPORT_SYMBOL(acpi_get_parent);
/*******************************************************************************
@@ -255,5 +258,5 @@
(void) acpi_ut_release_mutex (ACPI_MTX_NAMESPACE);
return (status);
}
-
+EXPORT_SYMBOL(acpi_get_next_object);
--- linux-2.6.10-rc1-mm3-full/drivers/acpi/namespace/nsxfeval.c.old 2004-11-09 01:04:58.000000000 +0100
+++ linux-2.6.10-rc1-mm3-full/drivers/acpi/namespace/nsxfeval.c 2004-11-09 01:32:30.000000000 +0100
@@ -42,6 +42,7 @@
* POSSIBILITY OF SUCH DAMAGES.
*/
+#include <linux/module.h>
#include <acpi/acpi.h>
#include <acpi/acnamesp.h>
@@ -354,6 +355,7 @@
return_ACPI_STATUS (status);
}
+EXPORT_SYMBOL(acpi_evaluate_object);
/*******************************************************************************
@@ -426,6 +428,7 @@
(void) acpi_ut_release_mutex (ACPI_MTX_NAMESPACE);
return_ACPI_STATUS (status);
}
+EXPORT_SYMBOL(acpi_walk_namespace);
/*******************************************************************************
@@ -599,6 +602,7 @@
(void) acpi_ut_release_mutex (ACPI_MTX_NAMESPACE);
return_ACPI_STATUS (status);
}
+EXPORT_SYMBOL(acpi_get_devices);
/*******************************************************************************
--- linux-2.6.10-rc1-mm3-full/drivers/acpi/tables/tbxface.c.old 2004-11-09 01:06:25.000000000 +0100
+++ linux-2.6.10-rc1-mm3-full/drivers/acpi/tables/tbxface.c 2004-11-09 01:46:04.000000000 +0100
@@ -42,6 +42,7 @@
* POSSIBILITY OF SUCH DAMAGES.
*/
+#include <linux/module.h>
#include <acpi/acpi.h>
#include <acpi/acnamesp.h>
@@ -439,5 +440,5 @@
ACPI_MEMCPY ((void *) ret_buffer->pointer, (void *) tbl_ptr, table_length);
return_ACPI_STATUS (AE_OK);
}
-
+EXPORT_SYMBOL(acpi_get_table);
--- linux-2.6.10-rc1-mm3-full/drivers/acpi/tables/tbxfroot.c.old 2004-11-09 01:07:05.000000000 +0100
+++ linux-2.6.10-rc1-mm3-full/drivers/acpi/tables/tbxfroot.c 2004-11-09 01:46:09.000000000 +0100
@@ -41,6 +41,7 @@
* POSSIBILITY OF SUCH DAMAGES.
*/
+#include <linux/module.h>
#include <acpi/acpi.h>
#include <acpi/actables.h>
@@ -321,6 +322,7 @@
}
return_ACPI_STATUS (status);
}
+EXPORT_SYMBOL(acpi_get_firmware_table);
/* TBD: Move to a new file */
--- linux-2.6.10-rc1-mm3-full/drivers/acpi/events/evxface.c.old 2004-11-09 01:07:59.000000000 +0100
+++ linux-2.6.10-rc1-mm3-full/drivers/acpi/events/evxface.c 2004-11-09 01:46:13.000000000 +0100
@@ -41,6 +41,7 @@
* POSSIBILITY OF SUCH DAMAGES.
*/
+#include <linux/module.h>
#include <acpi/acpi.h>
#include <acpi/acnamesp.h>
@@ -166,6 +167,7 @@
(void) acpi_ut_release_mutex (ACPI_MTX_EVENTS);
return_ACPI_STATUS (status);
}
+EXPORT_SYMBOL(acpi_install_fixed_event_handler);
/*******************************************************************************
@@ -223,6 +225,7 @@
(void) acpi_ut_release_mutex (ACPI_MTX_EVENTS);
return_ACPI_STATUS (status);
}
+EXPORT_SYMBOL(acpi_remove_fixed_event_handler);
/*******************************************************************************
@@ -392,6 +395,7 @@
(void) acpi_ut_release_mutex (ACPI_MTX_NAMESPACE);
return_ACPI_STATUS (status);
}
+EXPORT_SYMBOL(acpi_install_notify_handler);
/*******************************************************************************
@@ -550,6 +554,7 @@
(void) acpi_ut_release_mutex (ACPI_MTX_NAMESPACE);
return_ACPI_STATUS (status);
}
+EXPORT_SYMBOL(acpi_remove_notify_handler);
/*******************************************************************************
@@ -647,6 +652,7 @@
(void) acpi_ut_release_mutex (ACPI_MTX_EVENTS);
return_ACPI_STATUS (status);
}
+EXPORT_SYMBOL(acpi_install_gpe_handler);
/*******************************************************************************
@@ -749,6 +755,7 @@
(void) acpi_ut_release_mutex (ACPI_MTX_EVENTS);
return_ACPI_STATUS (status);
}
+EXPORT_SYMBOL(acpi_remove_gpe_handler);
/*******************************************************************************
@@ -791,6 +798,7 @@
return (status);
}
+EXPORT_SYMBOL(acpi_acquire_global_lock);
/*******************************************************************************
@@ -819,5 +827,5 @@
status = acpi_ev_release_global_lock ();
return (status);
}
-
+EXPORT_SYMBOL(acpi_release_global_lock);
--- linux-2.6.10-rc1-mm3-full/drivers/acpi/events/evxfregn.c.old 2004-11-09 01:09:47.000000000 +0100
+++ linux-2.6.10-rc1-mm3-full/drivers/acpi/events/evxfregn.c 2004-11-09 01:46:18.000000000 +0100
@@ -42,6 +42,7 @@
* POSSIBILITY OF SUCH DAMAGES.
*/
+#include <linux/module.h>
#include <acpi/acpi.h>
#include <acpi/acnamesp.h>
@@ -116,6 +117,7 @@
(void) acpi_ut_release_mutex (ACPI_MTX_NAMESPACE);
return_ACPI_STATUS (status);
}
+EXPORT_SYMBOL(acpi_install_address_space_handler);
/*******************************************************************************
@@ -241,5 +243,5 @@
(void) acpi_ut_release_mutex (ACPI_MTX_NAMESPACE);
return_ACPI_STATUS (status);
}
-
+EXPORT_SYMBOL(acpi_remove_address_space_handler);
--- linux-2.6.10-rc1-mm3-full/drivers/acpi/events/evxfevnt.c.old 2004-11-09 01:16:39.000000000 +0100
+++ linux-2.6.10-rc1-mm3-full/drivers/acpi/events/evxfevnt.c 2004-11-09 01:46:23.000000000 +0100
@@ -41,6 +41,7 @@
* POSSIBILITY OF SUCH DAMAGES.
*/
+#include <linux/module.h>
#include <acpi/acpi.h>
#include <acpi/acevents.h>
@@ -200,6 +201,7 @@
return_ACPI_STATUS (status);
}
+EXPORT_SYMBOL(acpi_enable_event);
/*******************************************************************************
@@ -248,6 +250,7 @@
unlock_and_exit:
return_ACPI_STATUS (status);
}
+EXPORT_SYMBOL(acpi_set_gpe_type);
/*******************************************************************************
@@ -305,6 +308,7 @@
}
return_ACPI_STATUS (status);
}
+EXPORT_SYMBOL(acpi_enable_gpe);
/*******************************************************************************
@@ -417,6 +421,7 @@
return_ACPI_STATUS (status);
}
+EXPORT_SYMBOL(acpi_disable_event);
/*******************************************************************************
@@ -456,6 +461,7 @@
return_ACPI_STATUS (status);
}
+EXPORT_SYMBOL(acpi_clear_event);
/*******************************************************************************
@@ -705,6 +711,7 @@
(void) acpi_ut_release_mutex (ACPI_MTX_NAMESPACE);
return_ACPI_STATUS (status);
}
+EXPORT_SYMBOL(acpi_install_gpe_block);
/*******************************************************************************
@@ -765,4 +772,5 @@
(void) acpi_ut_release_mutex (ACPI_MTX_NAMESPACE);
return_ACPI_STATUS (status);
}
+EXPORT_SYMBOL(acpi_remove_gpe_block);
--- linux-2.6.10-rc1-mm3-full/drivers/acpi/resources/rsxface.c.old 2004-11-09 01:18:54.000000000 +0100
+++ linux-2.6.10-rc1-mm3-full/drivers/acpi/resources/rsxface.c 2004-11-09 01:46:27.000000000 +0100
@@ -41,6 +41,7 @@
* POSSIBILITY OF SUCH DAMAGES.
*/
+#include <linux/module.h>
#include <acpi/acpi.h>
#include <acpi/acresrc.h>
@@ -156,6 +157,7 @@
status = acpi_rs_get_crs_method_data (device_handle, ret_buffer);
return_ACPI_STATUS (status);
}
+EXPORT_SYMBOL(acpi_get_current_resources);
/*******************************************************************************
@@ -208,6 +210,7 @@
status = acpi_rs_get_prs_method_data (device_handle, ret_buffer);
return_ACPI_STATUS (status);
}
+EXPORT_SYMBOL(acpi_get_possible_resources);
/*******************************************************************************
@@ -310,6 +313,7 @@
acpi_os_free (buffer.pointer);
return_ACPI_STATUS (status);
}
+EXPORT_SYMBOL(acpi_walk_resources);
/*******************************************************************************
@@ -354,6 +358,7 @@
status = acpi_rs_set_srs_method_data (device_handle, in_buffer);
return_ACPI_STATUS (status);
}
+EXPORT_SYMBOL(acpi_set_current_resources);
#define ACPI_COPY_FIELD(out, in, field) ((out)->field = (in)->field)
@@ -427,3 +432,5 @@
return (AE_OK);
}
+EXPORT_SYMBOL(acpi_resource_to_address64);
+
--- linux-2.6.10-rc1-mm3-full/drivers/acpi/hardware/hwregs.c.old 2004-11-09 01:22:44.000000000 +0100
+++ linux-2.6.10-rc1-mm3-full/drivers/acpi/hardware/hwregs.c 2004-11-09 01:46:31.000000000 +0100
@@ -43,6 +43,7 @@
* POSSIBILITY OF SUCH DAMAGES.
*/
+#include <linux/module.h>
#include <acpi/acpi.h>
#include <acpi/acnamesp.h>
@@ -211,6 +212,7 @@
acpi_ut_remove_reference (info.return_object);
return_ACPI_STATUS (status);
}
+EXPORT_SYMBOL(acpi_get_sleep_type_data);
/*******************************************************************************
@@ -307,6 +309,7 @@
return_ACPI_STATUS (status);
}
+EXPORT_SYMBOL(acpi_get_register);
/*******************************************************************************
@@ -457,6 +460,7 @@
value, register_value, bit_reg_info->parent_register));
return_ACPI_STATUS (status);
}
+EXPORT_SYMBOL(acpi_set_register);
/******************************************************************************
--- linux-2.6.10-rc1-mm3-full/drivers/acpi/hardware/hwsleep.c.old 2004-11-09 01:23:44.000000000 +0100
+++ linux-2.6.10-rc1-mm3-full/drivers/acpi/hardware/hwsleep.c 2004-11-09 01:46:36.000000000 +0100
@@ -42,6 +42,8 @@
* POSSIBILITY OF SUCH DAMAGES.
*/
+#include <linux/module.h>
+
#include <acpi/acpi.h>
#define _COMPONENT ACPI_HARDWARE
@@ -391,6 +393,7 @@
return_ACPI_STATUS (AE_OK);
}
+EXPORT_SYMBOL(acpi_enter_sleep_state);
/******************************************************************************
@@ -456,6 +459,7 @@
return_ACPI_STATUS (AE_OK);
}
+EXPORT_SYMBOL(acpi_enter_sleep_state_s4bios);
/******************************************************************************
--- linux-2.6.10-rc1-mm3-full/drivers/acpi/utilities/utxface.c.old 2004-11-09 01:24:52.000000000 +0100
+++ linux-2.6.10-rc1-mm3-full/drivers/acpi/utilities/utxface.c 2004-11-09 01:46:40.000000000 +0100
@@ -41,6 +41,7 @@
* POSSIBILITY OF SUCH DAMAGES.
*/
+#include <linux/module.h>
#include <acpi/acpi.h>
#include <acpi/acevents.h>
@@ -455,6 +456,7 @@
return_ACPI_STATUS (AE_OK);
}
+EXPORT_SYMBOL(acpi_get_system_info);
/*****************************************************************************
--- linux-2.6.10-rc1-mm3-full/drivers/acpi/utils.c.old 2004-11-09 01:29:13.000000000 +0100
+++ linux-2.6.10-rc1-mm3-full/drivers/acpi/utils.c 2004-11-09 01:29:51.000000000 +0100
@@ -233,6 +233,7 @@
return_ACPI_STATUS(AE_OK);
}
+EXPORT_SYMBOL(acpi_extract_package);
acpi_status
@@ -268,6 +269,7 @@
return_ACPI_STATUS(AE_OK);
}
+EXPORT_SYMBOL(acpi_evaluate_integer);
#if 0
@@ -409,5 +411,5 @@
return_ACPI_STATUS(status);
}
-
+EXPORT_SYMBOL(acpi_evaluate_reference);
--- linux-2.6.10-rc1-mm3-full/drivers/acpi/bus.c.old 2004-11-09 01:30:28.000000000 +0100
+++ linux-2.6.10-rc1-mm3-full/drivers/acpi/bus.c 2004-11-09 01:46:49.000000000 +0100
@@ -22,6 +22,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
*/
+#include <linux/module.h>
#include <linux/init.h>
#include <linux/ioport.h>
#include <linux/list.h>
@@ -44,8 +45,11 @@
#endif
FADT_DESCRIPTOR acpi_fadt;
+EXPORT_SYMBOL(acpi_fadt);
+
struct acpi_device *acpi_root;
struct proc_dir_entry *acpi_root_dir;
+EXPORT_SYMBOL(acpi_root_dir);
#define STRUCT_TO_INT(s) (*((int*)&s))
@@ -76,6 +80,7 @@
return_VALUE(0);
}
+EXPORT_SYMBOL(acpi_bus_get_device);
int
acpi_bus_get_status (
@@ -121,6 +126,7 @@
return_VALUE(0);
}
+EXPORT_SYMBOL(acpi_bus_get_status);
/* --------------------------------------------------------------------------
@@ -178,6 +184,7 @@
return_VALUE(0);
}
+EXPORT_SYMBOL(acpi_bus_get_power);
int
@@ -266,6 +273,7 @@
return_VALUE(result);
}
+EXPORT_SYMBOL(acpi_bus_set_power);
@@ -315,6 +323,7 @@
return_VALUE(0);
}
+EXPORT_SYMBOL(acpi_bus_generate_event);
int
acpi_bus_receive_event (
@@ -360,6 +369,7 @@
return_VALUE(0);
}
+EXPORT_SYMBOL(acpi_bus_receive_event);
/* --------------------------------------------------------------------------
--- linux-2.6.10-rc1-mm3-full/drivers/acpi/tables/tbconvrt.c.old 2004-11-09 01:31:07.000000000 +0100
+++ linux-2.6.10-rc1-mm3-full/drivers/acpi/tables/tbconvrt.c 2004-11-09 01:46:54.000000000 +0100
@@ -41,6 +41,7 @@
* POSSIBILITY OF SUCH DAMAGES.
*/
+#include <linux/module.h>
#include <acpi/acpi.h>
#include <acpi/actables.h>
@@ -51,6 +52,7 @@
u8 acpi_fadt_is_v1;
+EXPORT_SYMBOL(acpi_fadt_is_v1);
/*******************************************************************************
*
--- linux-2.6.10-rc1-mm3-full/drivers/acpi/scan.c.old 2004-11-09 01:34:12.000000000 +0100
+++ linux-2.6.10-rc1-mm3-full/drivers/acpi/scan.c 2004-11-09 01:35:29.000000000 +0100
@@ -609,6 +609,7 @@
return_VALUE(0);
}
+EXPORT_SYMBOL(acpi_bus_register_driver);
/**
@@ -635,6 +636,7 @@
}
return_VALUE(0);
}
+EXPORT_SYMBOL(acpi_bus_unregister_driver);
/**
* acpi_bus_find_driver
@@ -1107,7 +1109,7 @@
return_VALUE(result);
}
-
+EXPORT_SYMBOL(acpi_bus_add);
int acpi_bus_scan (struct acpi_device *start)
@@ -1211,6 +1213,7 @@
return_VALUE(0);
}
+EXPORT_SYMBOL(acpi_bus_scan);
int
@@ -1268,6 +1271,7 @@
}
return err;
}
+EXPORT_SYMBOL(acpi_bus_trim);
static int
acpi_bus_scan_fixed (
--- linux-2.6.10-rc1-mm3-full/drivers/acpi/pci_irq.c.old 2004-11-09 01:35:50.000000000 +0100
+++ linux-2.6.10-rc1-mm3-full/drivers/acpi/pci_irq.c 2004-11-09 01:36:08.000000000 +0100
@@ -426,3 +426,5 @@
return_VALUE(dev->irq);
}
+EXPORT_SYMBOL(acpi_pci_irq_enable);
+
--- linux-2.6.10-rc1-mm3-full/drivers/acpi/pci_root.c.old 2004-11-09 01:36:27.000000000 +0100
+++ linux-2.6.10-rc1-mm3-full/drivers/acpi/pci_root.c 2004-11-09 01:36:54.000000000 +0100
@@ -90,6 +90,7 @@
return n;
}
+EXPORT_SYMBOL(acpi_pci_register_driver);
void acpi_pci_unregister_driver(struct acpi_pci_driver *driver)
{
@@ -112,6 +113,7 @@
driver->remove(root->handle);
}
}
+EXPORT_SYMBOL(acpi_pci_unregister_driver);
static acpi_status
get_root_bridge_busnr_callback (struct acpi_resource *resource, void *data)
--- linux-2.6.10-rc1-mm3-full/drivers/acpi/ec.c.old 2004-11-09 01:37:08.000000000 +0100
+++ linux-2.6.10-rc1-mm3-full/drivers/acpi/ec.c 2004-11-09 01:37:28.000000000 +0100
@@ -262,6 +262,7 @@
else
return err;
}
+EXPORT_SYMBOL(ec_read);
int
ec_write(u8 addr, u8 val)
@@ -278,6 +279,7 @@
return err;
}
+EXPORT_SYMBOL(ec_write);
static int
--- linux-2.6.10-rc1-mm3-full/drivers/acpi/hardware/hwtimer.c.old 2004-11-09 01:21:52.000000000 +0100
+++ linux-2.6.10-rc1-mm3-full/drivers/acpi/hardware/hwtimer.c 2004-11-09 02:24:13.000000000 +0100
@@ -42,6 +42,8 @@
* POSSIBILITY OF SUCH DAMAGES.
*/
+#include <linux/module.h>
+
#include <acpi/acpi.h>
#define _COMPONENT ACPI_HARDWARE
@@ -112,6 +114,7 @@
return_ACPI_STATUS (status);
}
+EXPORT_SYMBOL(acpi_get_timer);
/******************************************************************************
@@ -196,5 +199,5 @@
*time_elapsed = (u32) quotient;
return_ACPI_STATUS (status);
}
-
+EXPORT_SYMBOL(acpi_get_timer_duration);
--- linux-2.6.10-rc1-mm3-full/drivers/acpi/Makefile.old 2004-11-09 01:38:35.000000000 +0100
+++ linux-2.6.10-rc1-mm3-full/drivers/acpi/Makefile 2004-11-09 01:39:09.000000000 +0100
@@ -12,8 +12,6 @@
EXTRA_CFLAGS += $(ACPI_CFLAGS)
-obj-$(CONFIG_ACPI) := acpi_ksyms.o
-
#
# ACPI Boot-Time Table Parsing
#
--- linux-2.6.10-rc1-mm3-full/drivers/acpi/acpi_ksyms.c 2004-11-09 01:14:55.000000000 +0100
+++ /dev/null 2004-08-23 02:01:39.000000000 +0200
@@ -1,165 +0,0 @@
-/*
- * acpi_ksyms.c - ACPI Kernel Symbols ($Revision: 16 $)
- *
- * Copyright (C) 2001, 2002 Andy Grover <andrew.grover@intel.com>
- * Copyright (C) 2001, 2002 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com>
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- */
-
-#include <linux/module.h>
-#include <linux/acpi.h>
-#include <acpi/acpi.h>
-#include <acpi/acpi_bus.h>
-
-
-#ifdef CONFIG_ACPI_INTERPRETER
-
-/* ACPI Debugger */
-
-#ifdef ENABLE_DEBUGGER
-
-extern int acpi_in_debugger;
-
-EXPORT_SYMBOL(acpi_in_debugger);
-EXPORT_SYMBOL(acpi_db_user_commands);
-
-#endif /* ENABLE_DEBUGGER */
-
-/* ACPI Core Subsystem */
-
-#ifdef ACPI_DEBUG_OUTPUT
-EXPORT_SYMBOL(acpi_dbg_layer);
-EXPORT_SYMBOL(acpi_dbg_level);
-EXPORT_SYMBOL(acpi_ut_debug_print_raw);
-EXPORT_SYMBOL(acpi_ut_debug_print);
-EXPORT_SYMBOL(acpi_ut_status_exit);
-EXPORT_SYMBOL(acpi_ut_value_exit);
-EXPORT_SYMBOL(acpi_ut_exit);
-EXPORT_SYMBOL(acpi_ut_trace);
-#endif /*ACPI_DEBUG_OUTPUT*/
-
-EXPORT_SYMBOL(acpi_get_handle);
-EXPORT_SYMBOL(acpi_get_parent);
-EXPORT_SYMBOL(acpi_get_type);
-EXPORT_SYMBOL(acpi_get_name);
-EXPORT_SYMBOL(acpi_get_object_info);
-EXPORT_SYMBOL(acpi_get_next_object);
-EXPORT_SYMBOL(acpi_evaluate_object);
-EXPORT_SYMBOL(acpi_get_table);
-EXPORT_SYMBOL(acpi_get_firmware_table);
-EXPORT_SYMBOL(acpi_install_notify_handler);
-EXPORT_SYMBOL(acpi_remove_notify_handler);
-EXPORT_SYMBOL(acpi_install_gpe_handler);
-EXPORT_SYMBOL(acpi_remove_gpe_handler);
-EXPORT_SYMBOL(acpi_install_address_space_handler);
-EXPORT_SYMBOL(acpi_remove_address_space_handler);
-EXPORT_SYMBOL(acpi_install_fixed_event_handler);
-EXPORT_SYMBOL(acpi_remove_fixed_event_handler);
-EXPORT_SYMBOL(acpi_acquire_global_lock);
-EXPORT_SYMBOL(acpi_release_global_lock);
-EXPORT_SYMBOL(acpi_install_gpe_block);
-EXPORT_SYMBOL(acpi_remove_gpe_block);
-EXPORT_SYMBOL(acpi_get_current_resources);
-EXPORT_SYMBOL(acpi_get_possible_resources);
-EXPORT_SYMBOL(acpi_walk_resources);
-EXPORT_SYMBOL(acpi_set_current_resources);
-EXPORT_SYMBOL(acpi_resource_to_address64);
-EXPORT_SYMBOL(acpi_enable_event);
-EXPORT_SYMBOL(acpi_disable_event);
-EXPORT_SYMBOL(acpi_clear_event);
-EXPORT_SYMBOL(acpi_set_gpe_type);
-EXPORT_SYMBOL(acpi_enable_gpe);
-EXPORT_SYMBOL(acpi_get_timer_duration);
-EXPORT_SYMBOL(acpi_get_timer);
-EXPORT_SYMBOL(acpi_get_sleep_type_data);
-EXPORT_SYMBOL(acpi_get_register);
-EXPORT_SYMBOL(acpi_set_register);
-EXPORT_SYMBOL(acpi_enter_sleep_state);
-EXPORT_SYMBOL(acpi_enter_sleep_state_s4bios);
-EXPORT_SYMBOL(acpi_get_system_info);
-EXPORT_SYMBOL(acpi_get_devices);
-
-/* ACPI OS Services Layer (acpi_osl.c) */
-
-EXPORT_SYMBOL(acpi_os_free);
-EXPORT_SYMBOL(acpi_os_printf);
-EXPORT_SYMBOL(acpi_os_sleep);
-EXPORT_SYMBOL(acpi_os_stall);
-EXPORT_SYMBOL(acpi_os_read_port);
-EXPORT_SYMBOL(acpi_os_write_port);
-EXPORT_SYMBOL(acpi_os_signal);
-EXPORT_SYMBOL(acpi_os_queue_for_execution);
-EXPORT_SYMBOL(acpi_os_signal_semaphore);
-EXPORT_SYMBOL(acpi_os_create_semaphore);
-EXPORT_SYMBOL(acpi_os_delete_semaphore);
-EXPORT_SYMBOL(acpi_os_wait_semaphore);
-EXPORT_SYMBOL(acpi_os_wait_events_complete);
-EXPORT_SYMBOL(acpi_os_read_pci_configuration);
-
-/* ACPI Utilities (acpi_utils.c) */
-
-EXPORT_SYMBOL(acpi_extract_package);
-EXPORT_SYMBOL(acpi_evaluate_integer);
-EXPORT_SYMBOL(acpi_evaluate_reference);
-
-#endif /*CONFIG_ACPI_INTERPRETER*/
-
-
-/* ACPI Bus Driver (acpi_bus.c) */
-
-#ifdef CONFIG_ACPI_BUS
-
-EXPORT_SYMBOL(acpi_fadt);
-EXPORT_SYMBOL(acpi_fadt_is_v1);
-EXPORT_SYMBOL(acpi_walk_namespace);
-EXPORT_SYMBOL(acpi_root_dir);
-EXPORT_SYMBOL(acpi_bus_get_device);
-EXPORT_SYMBOL(acpi_bus_get_status);
-EXPORT_SYMBOL(acpi_bus_get_power);
-EXPORT_SYMBOL(acpi_bus_set_power);
-EXPORT_SYMBOL(acpi_bus_generate_event);
-EXPORT_SYMBOL(acpi_bus_receive_event);
-EXPORT_SYMBOL(acpi_bus_register_driver);
-EXPORT_SYMBOL(acpi_bus_unregister_driver);
-EXPORT_SYMBOL(acpi_bus_scan);
-EXPORT_SYMBOL(acpi_bus_trim);
-EXPORT_SYMBOL(acpi_bus_add);
-
-#endif /*CONFIG_ACPI_BUS*/
-
-
-/* ACPI PCI Driver (pci_irq.c) */
-
-#ifdef CONFIG_ACPI_PCI
-
-#include <linux/pci.h>
-extern int acpi_pci_irq_enable(struct pci_dev *dev);
-EXPORT_SYMBOL(acpi_pci_irq_enable);
-EXPORT_SYMBOL(acpi_pci_register_driver);
-EXPORT_SYMBOL(acpi_pci_unregister_driver);
-#endif /*CONFIG_ACPI_PCI */
-
-#ifdef CONFIG_ACPI_EC
-/* ACPI EC driver (ec.c) */
-
-EXPORT_SYMBOL(ec_read);
-EXPORT_SYMBOL(ec_write);
-#endif
-
^ permalink raw reply [flat|nested] 19+ messages in thread* [2.6 patch] drivers/acpi: #ifdef unused functions away
2004-11-08 17:01 ` Len Brown
2004-11-09 1:40 ` [2.6 patch] kill acpi_ksyms.c Adrian Bunk
@ 2004-11-10 1:21 ` Adrian Bunk
2004-11-11 15:17 ` [ACPI] " Matthew Wilcox
1 sibling, 1 reply; 19+ messages in thread
From: Adrian Bunk @ 2004-11-10 1:21 UTC (permalink / raw)
To: Len Brown; +Cc: Arnaldo Carvalho de Melo, ACPI Developers, linux-kernel
On Mon, Nov 08, 2004 at 12:01:03PM -0500, Len Brown wrote:
> Thanks for the suggestion.
>
> I'd certainly accept patches using ACPI_FUTURE_USAGE and moving
> EXPORT_KSYMS to where they're more easily tracked.
My ACPI_FUTURE_USAGE patch (applies on top of my previous patch that
kills acpi_ksyms.c) is below.
This patch only #ifdef's completely unused code away - it does not make
the many global functions only used inside the file they are defined in
static.
> If the motivation is kernel static size reduction, then I'll be
> interested in seeing a before/after kernel size measurements.
(both examples with gcc 3.4.2 on i386 compiled for an Athlon)
Full .config (no module support, _everything_ possible compiled
statically into the kernel):
530552 2004-11-10 02:04 drivers/acpi/built-in.o
556195 2004-11-09 22:50 drivers/acpi/built-in.o-before-acpi-cleanup
-> 4.8% space saving
My own kernel (minimum ACPI support statically in the kernel for a
proper shutdown of my computer):
250235 2004-11-10 02:08 drivers/acpi/built-in.o
256262 2004-11-10 00:09 drivers/acpi/built-in.o-before-acpi-cleanup
-> 2.4% space saving
The nice thing is that we get these space savings for free.
diffstat output:
drivers/acpi/dispatcher/dsmthdat.c | 3 ++-
drivers/acpi/dispatcher/dswstate.c | 10 ++++++++--
drivers/acpi/events/evxface.c | 3 ++-
drivers/acpi/events/evxfevnt.c | 7 ++++++-
drivers/acpi/executer/exdump.c | 4 ++++
drivers/acpi/hardware/Makefile | 4 +++-
drivers/acpi/hardware/hwgpe.c | 3 ++-
drivers/acpi/hardware/hwsleep.c | 3 ++-
drivers/acpi/namespace/Makefile | 4 +++-
drivers/acpi/namespace/nsdump.c | 4 ++++
drivers/acpi/namespace/nsload.c | 4 ++++
drivers/acpi/namespace/nsutils.c | 3 ++-
drivers/acpi/namespace/nsxfeval.c | 3 ++-
drivers/acpi/osl.c | 6 ++++++
drivers/acpi/parser/pstree.c | 4 +++-
drivers/acpi/parser/psutils.c | 2 ++
drivers/acpi/pci_bind.c | 2 ++
drivers/acpi/resources/Makefile | 4 +++-
drivers/acpi/resources/rsutils.c | 3 ++-
drivers/acpi/resources/rsxface.c | 3 ++-
drivers/acpi/tables/tbutils.c | 3 ++-
drivers/acpi/tables/tbxface.c | 4 ++++
drivers/acpi/utilities/utalloc.c | 3 ++-
drivers/acpi/utilities/utmisc.c | 3 ++-
drivers/acpi/utilities/utxface.c | 4 ++++
include/acpi/acdispat.h | 8 ++++++++
include/acpi/achware.h | 5 ++++-
include/acpi/acinterp.h | 3 ++-
include/acpi/acmacros.h | 8 ++++++++
include/acpi/acnamesp.h | 10 ++++++++++
include/acpi/acparser.h | 4 ++++
include/acpi/acpiosxf.h | 6 ++++++
include/acpi/acpixf.h | 20 ++++++++++++++++++++
include/acpi/acresrc.h | 4 ++++
include/acpi/actables.h | 2 ++
include/acpi/acutils.h | 6 ++++++
include/acpi/platform/acenv.h | 8 ++++++++
37 files changed, 160 insertions(+), 20 deletions(-)
Signed-off-by: Adrian Bunk <bunk@stusta.de>
--- linux-2.6.10-rc1-mm4-full/include/acpi/acdispat.h.old 2004-11-09 22:57:58.000000000 +0100
+++ linux-2.6.10-rc1-mm4-full/include/acpi/acdispat.h 2004-11-09 23:03:38.000000000 +0100
@@ -62,10 +62,12 @@
u32 pop_count,
struct acpi_walk_state *walk_state);
+#ifdef ACPI_FUTURE_USAGE
void *
acpi_ds_obj_stack_get_value (
u32 index,
struct acpi_walk_state *walk_state);
+#endif
acpi_status
acpi_ds_obj_stack_pop_object (
@@ -248,11 +250,13 @@
acpi_ds_is_method_value (
union acpi_operand_object *obj_desc);
+#ifdef ACPI_FUTURE_USAGE
acpi_object_type
acpi_ds_method_data_get_type (
u16 opcode,
u32 index,
struct acpi_walk_state *walk_state);
+#endif
acpi_status
acpi_ds_method_data_get_value (
@@ -440,9 +444,11 @@
struct acpi_parameter_info *info,
u32 pass_number);
+#ifdef ACPI_FUTURE_USAGE
acpi_status
acpi_ds_obj_stack_delete_all (
struct acpi_walk_state *walk_state);
+#endif
acpi_status
acpi_ds_obj_stack_pop_and_delete (
@@ -482,6 +488,7 @@
acpi_ds_delete_walk_state_cache (
void);
+#ifdef ACPI_FUTURE_USAGE
acpi_status
acpi_ds_result_insert (
void *object,
@@ -493,6 +500,7 @@
union acpi_operand_object **object,
u32 index,
struct acpi_walk_state *walk_state);
+#endif
acpi_status
acpi_ds_result_pop (
--- linux-2.6.10-rc1-mm4-full/drivers/acpi/dispatcher/dsmthdat.c.old 2004-11-09 22:58:59.000000000 +0100
+++ linux-2.6.10-rc1-mm4-full/drivers/acpi/dispatcher/dsmthdat.c 2004-11-09 22:59:33.000000000 +0100
@@ -350,7 +350,7 @@
* RETURN: Data type of current value of the selected Arg or Local
*
******************************************************************************/
-
+#ifdef ACPI_FUTURE_USAGE
acpi_object_type
acpi_ds_method_data_get_type (
u16 opcode,
@@ -385,6 +385,7 @@
return_VALUE (ACPI_GET_OBJECT_TYPE (object));
}
+#endif /* ACPI_FUTURE_USAGE */
/*******************************************************************************
--- linux-2.6.10-rc1-mm4-full/drivers/acpi/dispatcher/dswstate.c.old 2004-11-09 23:01:14.000000000 +0100
+++ linux-2.6.10-rc1-mm4-full/drivers/acpi/dispatcher/dswstate.c 2004-11-09 23:04:17.000000000 +0100
@@ -51,6 +51,8 @@
ACPI_MODULE_NAME ("dswstate")
+#ifdef ACPI_FUTURE_USAGE
+
/*******************************************************************************
*
* FUNCTION: acpi_ds_result_insert
@@ -174,6 +176,8 @@
return (AE_OK);
}
+#endif /* ACPI_FUTURE_USAGE */
+
/*******************************************************************************
*
@@ -445,7 +449,7 @@
* Should be used with great care, if at all!
*
******************************************************************************/
-
+#ifdef ACPI_FUTURE_USAGE
acpi_status
acpi_ds_obj_stack_delete_all (
struct acpi_walk_state *walk_state)
@@ -467,6 +471,7 @@
return_ACPI_STATUS (AE_OK);
}
+#endif /* ACPI_FUTURE_USAGE */
/*******************************************************************************
@@ -687,7 +692,7 @@
* be within the range of the current stack pointer.
*
******************************************************************************/
-
+#ifdef ACPI_FUTURE_USAGE
void *
acpi_ds_obj_stack_get_value (
u32 index,
@@ -712,6 +717,7 @@
return_PTR (walk_state->operands[(acpi_native_uint)(walk_state->num_operands - 1) -
index]);
}
+#endif /* ACPI_FUTURE_USAGE */
/*******************************************************************************
--- linux-2.6.10-rc1-mm4-full/include/acpi/acpixf.h.old 2004-11-09 23:05:59.000000000 +0100
+++ linux-2.6.10-rc1-mm4-full/include/acpi/acpixf.h 2004-11-10 01:27:52.000000000 +0100
@@ -70,9 +70,11 @@
acpi_terminate (
void);
+#ifdef ACPI_FUTURE_USAGE
acpi_status
acpi_subsystem_status (
void);
+#endif
acpi_status
acpi_enable (
@@ -82,9 +84,11 @@
acpi_disable (
void);
+#ifdef ACPI_FUTURE_USAGE
acpi_status
acpi_get_system_info (
struct acpi_buffer *ret_buffer);
+#endif
const char *
acpi_format_exception (
@@ -94,10 +98,12 @@
acpi_purge_cached_objects (
void);
+#ifdef ACPI_FUTURE_USAGE
acpi_status
acpi_install_initialization_handler (
acpi_init_handler handler,
u32 function);
+#endif
/*
* ACPI Memory manager
@@ -129,6 +135,7 @@
acpi_load_tables (
void);
+#ifdef ACPI_FUTURE_USAGE
acpi_status
acpi_load_table (
struct acpi_table_header *table_ptr);
@@ -142,6 +149,7 @@
acpi_table_type table_type,
u32 instance,
struct acpi_table_header *out_table_header);
+#endif /* ACPI_FUTURE_USAGE */
acpi_status
acpi_get_table (
@@ -218,6 +226,7 @@
struct acpi_object_list *parameter_objects,
struct acpi_buffer *return_object_buffer);
+#ifdef ACPI_FUTURE_USAGE
acpi_status
acpi_evaluate_object_typed (
acpi_handle object,
@@ -225,6 +234,7 @@
struct acpi_object_list *external_params,
struct acpi_buffer *return_buffer,
acpi_object_type return_type);
+#endif
acpi_status
acpi_get_object_info (
@@ -299,9 +309,11 @@
acpi_event_handler address,
void *context);
+#ifdef ACPI_FUTURE_USAGE
acpi_status
acpi_install_exception_handler (
acpi_exception_handler handler);
+#endif
/*
@@ -333,6 +345,7 @@
u32 event,
u32 flags);
+#ifdef ACPI_FUTURE_USAGE
acpi_status
acpi_clear_event (
u32 event);
@@ -341,6 +354,7 @@
acpi_get_event_status (
u32 event,
acpi_event_status *event_status);
+#endif /* ACPI_FUTURE_USAGE */
acpi_status
acpi_set_gpe_type (
@@ -366,6 +380,7 @@
u32 gpe_number,
u32 flags);
+#ifdef ACPI_FUTURE_USAGE
acpi_status
acpi_get_gpe_status (
acpi_handle gpe_device,
@@ -383,6 +398,7 @@
acpi_status
acpi_remove_gpe_block (
acpi_handle gpe_device);
+#endif /* ACPI_FUTURE_USAGE */
/*
@@ -400,10 +416,12 @@
acpi_handle device_handle,
struct acpi_buffer *ret_buffer);
+#ifdef ACPI_FUTURE_USAGE
acpi_status
acpi_get_possible_resources(
acpi_handle device_handle,
struct acpi_buffer *ret_buffer);
+#endif
acpi_status
acpi_walk_resources (
@@ -447,9 +465,11 @@
acpi_set_firmware_waking_vector (
acpi_physical_address physical_address);
+#ifdef ACPI_FUTURE_USAGE
acpi_status
acpi_get_firmware_waking_vector (
acpi_physical_address *physical_address);
+#endif
acpi_status
acpi_get_sleep_type_data (
--- linux-2.6.10-rc1-mm4-full/drivers/acpi/events/evxface.c.old 2004-11-09 23:06:33.000000000 +0100
+++ linux-2.6.10-rc1-mm4-full/drivers/acpi/events/evxface.c 2004-11-09 23:07:05.000000000 +0100
@@ -64,7 +64,7 @@
* DESCRIPTION: Saves the pointer to the handler function
*
******************************************************************************/
-
+#ifdef ACPI_FUTURE_USAGE
acpi_status
acpi_install_exception_handler (
acpi_exception_handler handler)
@@ -95,6 +95,7 @@
(void) acpi_ut_release_mutex (ACPI_MTX_EVENTS);
return_ACPI_STATUS (status);
}
+#endif /* ACPI_FUTURE_USAGE */
/*******************************************************************************
--- linux-2.6.10-rc1-mm4-full/drivers/acpi/events/evxfevnt.c.old 2004-11-09 23:07:56.000000000 +0100
+++ linux-2.6.10-rc1-mm4-full/drivers/acpi/events/evxfevnt.c 2004-11-09 23:10:03.000000000 +0100
@@ -435,7 +435,7 @@
* DESCRIPTION: Clear an ACPI event (fixed)
*
******************************************************************************/
-
+#ifdef ACPI_FUTURE_USAGE
acpi_status
acpi_clear_event (
u32 event)
@@ -462,6 +462,7 @@
return_ACPI_STATUS (status);
}
EXPORT_SYMBOL(acpi_clear_event);
+#endif /* ACPI_FUTURE_USAGE */
/*******************************************************************************
@@ -518,6 +519,8 @@
}
+#ifdef ACPI_FUTURE_USAGE
+
/*******************************************************************************
*
* FUNCTION: acpi_get_event_status
@@ -774,3 +777,5 @@
}
EXPORT_SYMBOL(acpi_remove_gpe_block);
+#endif /* ACPI_FUTURE_USAGE */
+
--- linux-2.6.10-rc1-mm4-full/include/acpi/acinterp.h.old 2004-11-09 23:14:33.000000000 +0100
+++ linux-2.6.10-rc1-mm4-full/include/acpi/acinterp.h 2004-11-09 23:18:00.000000000 +0100
@@ -504,6 +504,7 @@
char *module_name,
u32 line_number);
+#ifdef ACPI_FUTURE_USAGE
void
acpi_ex_dump_object_descriptor (
union acpi_operand_object *object,
@@ -533,7 +534,7 @@
acpi_ex_out_address (
char *title,
acpi_physical_address value);
-
+#endif /* ACPI_FUTURE_USAGE */
/*
* exnames - interpreter/scanner name load/execute
--- linux-2.6.10-rc1-mm4-full/drivers/acpi/executer/exdump.c.old 2004-11-09 23:13:44.000000000 +0100
+++ linux-2.6.10-rc1-mm4-full/drivers/acpi/executer/exdump.c 2004-11-09 23:17:42.000000000 +0100
@@ -438,6 +438,8 @@
}
+#ifdef ACPI_FUTURE_USAGE
+
/*****************************************************************************
*
* FUNCTION: acpi_ex_out*
@@ -786,5 +788,7 @@
return_VOID;
}
+#endif /* ACPI_FUTURE_USAGE */
+
#endif
--- linux-2.6.10-rc1-mm4-full/drivers/acpi/hardware/hwsleep.c.old 2004-11-09 23:38:42.000000000 +0100
+++ linux-2.6.10-rc1-mm4-full/drivers/acpi/hardware/hwsleep.c 2004-11-09 23:39:04.000000000 +0100
@@ -112,7 +112,7 @@
* DESCRIPTION: Access function for firmware_waking_vector field in FACS
*
******************************************************************************/
-
+#ifdef ACPI_FUTURE_USAGE
acpi_status
acpi_get_firmware_waking_vector (
acpi_physical_address *physical_address)
@@ -138,6 +138,7 @@
return_ACPI_STATUS (AE_OK);
}
+#endif
/******************************************************************************
--- linux-2.6.10-rc1-mm4-full/include/acpi/achware.h.old 2004-11-09 23:39:24.000000000 +0100
+++ linux-2.6.10-rc1-mm4-full/include/acpi/achware.h 2004-11-10 01:57:41.000000000 +0100
@@ -131,10 +131,12 @@
struct acpi_gpe_xrupt_info *gpe_xrupt_info,
struct acpi_gpe_block_info *gpe_block);
+#ifdef ACPI_FUTURE_USAGE
acpi_status
acpi_hw_get_gpe_status (
struct acpi_gpe_event_info *gpe_event_info,
acpi_event_status *event_status);
+#endif
acpi_status
acpi_hw_disable_all_gpes (
@@ -161,6 +163,7 @@
/* ACPI Timer prototypes */
+#ifdef ACPI_FUTURE_USAGE
acpi_status
acpi_get_timer_resolution (
u32 *resolution);
@@ -174,6 +177,6 @@
u32 start_ticks,
u32 end_ticks,
u32 *time_elapsed);
-
+#endif /* ACPI_FUTURE_USAGE */
#endif /* __ACHWARE_H__ */
--- linux-2.6.10-rc1-mm4-full/drivers/acpi/hardware/Makefile.old 2004-11-09 23:40:15.000000000 +0100
+++ linux-2.6.10-rc1-mm4-full/drivers/acpi/hardware/Makefile 2004-11-09 23:40:52.000000000 +0100
@@ -2,6 +2,8 @@
# Makefile for all Linux ACPI interpreter subdirectories
#
-obj-y := hwacpi.o hwgpe.o hwregs.o hwsleep.o hwtimer.o
+obj-y := hwacpi.o hwgpe.o hwregs.o hwsleep.o
+
+obj-$(ACPI_FUTURE_USAGE) += hwtimer.o
EXTRA_CFLAGS += $(ACPI_CFLAGS)
--- linux-2.6.10-rc1-mm4-full/include/acpi/acmacros.h.old 2004-11-09 23:43:54.000000000 +0100
+++ linux-2.6.10-rc1-mm4-full/include/acpi/acmacros.h 2004-11-09 23:44:51.000000000 +0100
@@ -538,7 +538,11 @@
#define ACPI_DUMP_ENTRY(a,b) acpi_ns_dump_entry (a,b)
+
+#ifdef ACPI_FUTURE_USAGE
#define ACPI_DUMP_TABLES(a,b) acpi_ns_dump_tables(a,b)
+#endif
+
#define ACPI_DUMP_PATHNAME(a,b,c,d) acpi_ns_dump_pathname(a,b,c,d)
#define ACPI_DUMP_RESOURCE_LIST(a) acpi_rs_dump_resource_list(a)
#define ACPI_DUMP_BUFFER(a,b) acpi_ut_dump_buffer((u8 *)a,b,DB_BYTE_DISPLAY,_COMPONENT)
@@ -591,7 +595,11 @@
#define ACPI_DUMP_STACK_ENTRY(a)
#define ACPI_DUMP_OPERANDS(a,b,c,d,e)
#define ACPI_DUMP_ENTRY(a,b)
+
+#ifdef ACPI_FUTURE_USAGE
#define ACPI_DUMP_TABLES(a,b)
+#endif
+
#define ACPI_DUMP_PATHNAME(a,b,c,d)
#define ACPI_DUMP_RESOURCE_LIST(a)
#define ACPI_DUMP_BUFFER(a,b)
--- linux-2.6.10-rc1-mm4-full/include/acpi/acnamesp.h.old 2004-11-09 23:44:55.000000000 +0100
+++ linux-2.6.10-rc1-mm4-full/include/acpi/acnamesp.h 2004-11-10 00:02:03.000000000 +0100
@@ -210,6 +210,7 @@
* Namespace modification - nsmodify
*/
+#ifdef ACPI_FUTURE_USAGE
acpi_status
acpi_ns_unload_namespace (
acpi_handle handle);
@@ -217,16 +218,19 @@
acpi_status
acpi_ns_delete_subtree (
acpi_handle start_handle);
+#endif
/*
* Namespace dump/print utilities - nsdump
*/
+#ifdef ACPI_FUTURE_USAGE
void
acpi_ns_dump_tables (
acpi_handle search_base,
u32 max_depth);
+#endif
void
acpi_ns_dump_entry (
@@ -245,6 +249,7 @@
u32 num_segments,
char *pathname);
+#ifdef ACPI_FUTURE_USAGE
acpi_status
acpi_ns_dump_one_device (
acpi_handle obj_handle,
@@ -255,6 +260,7 @@
void
acpi_ns_dump_root_devices (
void);
+#endif /* ACPI_FUTURE_USAGE */
acpi_status
acpi_ns_dump_one_object (
@@ -263,6 +269,7 @@
void *context,
void **return_value);
+#ifdef ACPI_FUTURE_USAGE
void
acpi_ns_dump_objects (
acpi_object_type type,
@@ -270,6 +277,7 @@
u32 max_depth,
u32 ownder_id,
acpi_handle start_handle);
+#endif
/*
@@ -303,9 +311,11 @@
* Parent/Child/Peer utility functions
*/
+#ifdef ACPI_FUTURE_USAGE
acpi_name
acpi_ns_find_parent_name (
struct acpi_namespace_node *node_to_search);
+#endif
/*
--- linux-2.6.10-rc1-mm4-full/drivers/acpi/namespace/nsdump.c.old 2004-11-09 23:52:20.000000000 +0100
+++ linux-2.6.10-rc1-mm4-full/drivers/acpi/namespace/nsdump.c 2004-11-09 23:48:07.000000000 +0100
@@ -550,6 +550,8 @@
}
+#ifdef ACPI_FUTURE_USAGE
+
/*******************************************************************************
*
* FUNCTION: acpi_ns_dump_objects
@@ -635,6 +637,8 @@
return_VOID;
}
+#endif /* ACPI_FUTURE_USAGE */
+
/*******************************************************************************
*
--- linux-2.6.10-rc1-mm4-full/drivers/acpi/namespace/Makefile.old 2004-11-09 23:50:33.000000000 +0100
+++ linux-2.6.10-rc1-mm4-full/drivers/acpi/namespace/Makefile 2004-11-09 23:51:18.000000000 +0100
@@ -2,9 +2,11 @@
# Makefile for all Linux ACPI interpreter subdirectories
#
-obj-y := nsaccess.o nsdumpdv.o nsload.o nssearch.o nsxfeval.o \
+obj-y := nsaccess.o nsload.o nssearch.o nsxfeval.o \
nsalloc.o nseval.o nsnames.o nsutils.o nsxfname.o \
nsdump.o nsinit.o nsobject.o nswalk.o nsxfobj.o \
nsparse.o
+obj-$(ACPI_FUTURE_USAGE) += nsdumpdv.o
+
EXTRA_CFLAGS += $(ACPI_CFLAGS)
--- linux-2.6.10-rc1-mm4-full/drivers/acpi/namespace/nsload.c.old 2004-11-09 23:57:35.000000000 +0100
+++ linux-2.6.10-rc1-mm4-full/drivers/acpi/namespace/nsload.c 2004-11-09 23:57:23.000000000 +0100
@@ -321,6 +321,8 @@
}
+#ifdef ACPI_FUTURE_USAGE
+
/*******************************************************************************
*
* FUNCTION: acpi_ns_delete_subtree
@@ -452,5 +454,7 @@
return_ACPI_STATUS (status);
}
+#endif /* ACPI_FUTURE_USAGE */
+
#endif
--- linux-2.6.10-rc1-mm4-full/drivers/acpi/namespace/nsutils.c.old 2004-11-09 23:59:26.000000000 +0100
+++ linux-2.6.10-rc1-mm4-full/drivers/acpi/namespace/nsutils.c 2004-11-10 00:01:38.000000000 +0100
@@ -961,7 +961,7 @@
* (which "should not happen").
*
******************************************************************************/
-
+#ifdef ACPI_FUTURE_USAGE
acpi_name
acpi_ns_find_parent_name (
struct acpi_namespace_node *child_node)
@@ -994,6 +994,7 @@
return_VALUE (ACPI_UNKNOWN_NAME);
}
+#endif
/*******************************************************************************
--- linux-2.6.10-rc1-mm4-full/drivers/acpi/namespace/nsxfeval.c.old 2004-11-10 00:02:29.000000000 +0100
+++ linux-2.6.10-rc1-mm4-full/drivers/acpi/namespace/nsxfeval.c 2004-11-10 00:03:10.000000000 +0100
@@ -73,7 +73,7 @@
* be valid (non-null)
*
******************************************************************************/
-
+#ifdef ACPI_FUTURE_USAGE
acpi_status
acpi_evaluate_object_typed (
acpi_handle handle,
@@ -144,6 +144,7 @@
return_buffer->length = 0;
return_ACPI_STATUS (AE_TYPE);
}
+#endif /* ACPI_FUTURE_USAGE */
/*******************************************************************************
--- linux-2.6.10-rc1-mm4-full/include/acpi/acpiosxf.h.old 2004-11-10 00:07:23.000000000 +0100
+++ linux-2.6.10-rc1-mm4-full/include/acpi/acpiosxf.h 2004-11-10 00:09:31.000000000 +0100
@@ -176,10 +176,12 @@
void __iomem *logical_address,
acpi_size size);
+#ifdef ACPI_FUTURE_USAGE
acpi_status
acpi_os_get_physical_address (
void *logical_address,
acpi_physical_address *physical_address);
+#endif
/*
@@ -302,10 +304,12 @@
void *pointer,
acpi_size length);
+#ifdef ACPI_FUTURE_USAGE
u8
acpi_os_writable (
void *pointer,
acpi_size length);
+#endif
u64
acpi_os_get_timer (
@@ -339,9 +343,11 @@
* Debug input
*/
+#ifdef ACPI_FUTURE_USAGE
u32
acpi_os_get_line (
char *buffer);
+#endif
/*
--- linux-2.6.10-rc1-mm4-full/drivers/acpi/osl.c.old 2004-11-10 00:06:09.000000000 +0100
+++ linux-2.6.10-rc1-mm4-full/drivers/acpi/osl.c 2004-11-10 00:09:12.000000000 +0100
@@ -211,6 +211,7 @@
iounmap(virt);
}
+#ifdef ACPI_FUTURE_USAGE
acpi_status
acpi_os_get_physical_address(void *virt, acpi_physical_address *phys)
{
@@ -221,6 +222,7 @@
return AE_OK;
}
+#endif
#define ACPI_MAX_OVERRIDE_LEN 100
@@ -989,6 +991,7 @@
}
EXPORT_SYMBOL(acpi_os_signal_semaphore);
+#ifdef ACPI_FUTURE_USAGE
u32
acpi_os_get_line(char *buffer)
{
@@ -1007,6 +1010,7 @@
return 0;
}
+#endif /* ACPI_FUTURE_USAGE */
/* Assumes no unreadable holes inbetween */
u8
@@ -1019,6 +1023,7 @@
return 1;
}
+#ifdef ACPI_FUTURE_USAGE
u8
acpi_os_writable(void *ptr, acpi_size len)
{
@@ -1026,6 +1031,7 @@
The later may be difficult at early boot when kmap doesn't work yet. */
return 1;
}
+#endif
u32
acpi_os_get_thread_id (void)
--- linux-2.6.10-rc1-mm4-full/include/acpi/acparser.h.old 2004-11-10 00:13:14.000000000 +0100
+++ linux-2.6.10-rc1-mm4-full/include/acpi/acparser.h 2004-11-10 00:15:57.000000000 +0100
@@ -247,6 +247,7 @@
union acpi_parse_object *op,
u32 argn);
+#ifdef ACPI_FUTURE_USAGE
union acpi_parse_object *
acpi_ps_get_child (
union acpi_parse_object *op);
@@ -255,6 +256,7 @@
acpi_ps_get_depth_next (
union acpi_parse_object *origin,
union acpi_parse_object *op);
+#endif /* ACPI_FUTURE_USAGE */
/* pswalk - parse tree walk routines */
@@ -313,9 +315,11 @@
acpi_ps_is_prefix_char (
u32 c);
+#ifdef ACPI_FUTURE_USAGE
u32
acpi_ps_get_name(
union acpi_parse_object *op);
+#endif
void
acpi_ps_set_name(
--- linux-2.6.10-rc1-mm4-full/drivers/acpi/parser/pstree.c.old 2004-11-10 00:13:48.000000000 +0100
+++ linux-2.6.10-rc1-mm4-full/drivers/acpi/parser/pstree.c 2004-11-10 00:14:57.000000000 +0100
@@ -181,6 +181,8 @@
}
+#ifdef ACPI_FUTURE_USAGE
+
/*******************************************************************************
*
* FUNCTION: acpi_ps_get_child
@@ -192,7 +194,6 @@
* DESCRIPTION: Get op's children or NULL if none
*
******************************************************************************/
-
union acpi_parse_object *
acpi_ps_get_child (
union acpi_parse_object *op)
@@ -322,4 +323,5 @@
return (next);
}
+#endif /* ACPI_FUTURE_USAGE */
--- linux-2.6.10-rc1-mm4-full/drivers/acpi/parser/psutils.c.old 2004-11-10 00:16:07.000000000 +0100
+++ linux-2.6.10-rc1-mm4-full/drivers/acpi/parser/psutils.c 2004-11-10 00:16:28.000000000 +0100
@@ -267,6 +267,7 @@
/*
* Get op's name (4-byte name segment) or 0 if unnamed
*/
+#ifdef ACPI_FUTURE_USAGE
u32
acpi_ps_get_name (
union acpi_parse_object *op)
@@ -283,6 +284,7 @@
return (op->named.name);
}
+#endif /* ACPI_FUTURE_USAGE */
/*
--- linux-2.6.10-rc1-mm4-full/drivers/acpi/pci_bind.c.old 2004-11-10 00:18:17.000000000 +0100
+++ linux-2.6.10-rc1-mm4-full/drivers/acpi/pci_bind.c 2004-11-10 00:22:00.000000000 +0100
@@ -67,6 +67,7 @@
* to resolve PCI information for ACPI-PCI devices defined in the namespace.
* This typically occurs when resolving PCI operation region information.
*/
+#ifdef ACPI_FUTURE_USAGE
acpi_status
acpi_os_get_pci_id (
acpi_handle handle,
@@ -114,6 +115,7 @@
return_ACPI_STATUS(AE_OK);
}
+#endif /* ACPI_FUTURE_USAGE */
int
--- linux-2.6.10-rc1-mm4-full/include/acpi/acresrc.h.old 2004-11-10 02:02:19.000000000 +0100
+++ linux-2.6.10-rc1-mm4-full/include/acpi/acresrc.h 2004-11-10 01:59:58.000000000 +0100
@@ -60,10 +60,12 @@
acpi_handle handle,
struct acpi_buffer *ret_buffer);
+#ifdef ACPI_FUTURE_USAGE
acpi_status
acpi_rs_get_prs_method_data (
acpi_handle handle,
struct acpi_buffer *ret_buffer);
+#endif
acpi_status
acpi_rs_get_method_data (
@@ -95,6 +97,7 @@
/*
* Function prototypes called from acpi_rs_create*
*/
+#ifdef ACPI_FUTURE_USAGE
void
acpi_rs_dump_irq (
union acpi_resource_data *data);
@@ -154,6 +157,7 @@
void
acpi_rs_dump_irq_list (
u8 *route_table);
+#endif /* ACPI_FUTURE_USAGE */
acpi_status
acpi_rs_get_byte_stream_start (
--- linux-2.6.10-rc1-mm4-full/drivers/acpi/resources/rsxface.c.old 2004-11-10 00:32:09.000000000 +0100
+++ linux-2.6.10-rc1-mm4-full/drivers/acpi/resources/rsxface.c 2004-11-10 00:32:32.000000000 +0100
@@ -180,7 +180,7 @@
* and the value of ret_buffer is undefined.
*
******************************************************************************/
-
+#ifdef ACPI_FUTURE_USAGE
acpi_status
acpi_get_possible_resources (
acpi_handle device_handle,
@@ -211,6 +211,7 @@
return_ACPI_STATUS (status);
}
EXPORT_SYMBOL(acpi_get_possible_resources);
+#endif /* ACPI_FUTURE_USAGE */
/*******************************************************************************
--- linux-2.6.10-rc1-mm4-full/include/acpi/actables.h.old 2004-11-10 00:37:23.000000000 +0100
+++ linux-2.6.10-rc1-mm4-full/include/acpi/actables.h 2004-11-10 00:37:41.000000000 +0100
@@ -50,10 +50,12 @@
#define SIZE_IN_HEADER 0
+#ifdef ACPI_FUTURE_USAGE
acpi_status
acpi_tb_handle_to_object (
u16 table_id,
struct acpi_table_desc **table_desc);
+#endif
/*
* tbconvrt - Table conversion routines
--- linux-2.6.10-rc1-mm4-full/drivers/acpi/tables/tbutils.c.old 2004-11-10 00:37:51.000000000 +0100
+++ linux-2.6.10-rc1-mm4-full/drivers/acpi/tables/tbutils.c 2004-11-10 00:38:30.000000000 +0100
@@ -62,7 +62,7 @@
* return a pointer to that table descriptor.
*
******************************************************************************/
-
+#ifdef ACPI_FUTURE_USAGE
acpi_status
acpi_tb_handle_to_object (
u16 table_id,
@@ -90,6 +90,7 @@
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "table_id=%X does not exist\n", table_id));
return (AE_BAD_PARAMETER);
}
+#endif /* ACPI_FUTURE_USAGE */
/*******************************************************************************
--- linux-2.6.10-rc1-mm4-full/drivers/acpi/tables/tbxface.c.old 2004-11-10 00:39:15.000000000 +0100
+++ linux-2.6.10-rc1-mm4-full/drivers/acpi/tables/tbxface.c 2004-11-10 00:45:05.000000000 +0100
@@ -138,6 +138,8 @@
}
+#ifdef ACPI_FUTURE_USAGE
+
/*******************************************************************************
*
* FUNCTION: acpi_load_table
@@ -344,6 +346,8 @@
}
+#endif /* ACPI_FUTURE_USAGE */
+
/*******************************************************************************
*
* FUNCTION: acpi_get_table
--- linux-2.6.10-rc1-mm4-full/include/acpi/acutils.h.old 2004-11-10 00:47:57.000000000 +0100
+++ linux-2.6.10-rc1-mm4-full/include/acpi/acutils.h 2004-11-10 01:23:29.000000000 +0100
@@ -666,12 +666,14 @@
u16 action,
union acpi_generic_state **state_list);
+#ifdef ACPI_FUTURE_USAGE
acpi_status
acpi_ut_create_pkg_state_and_push (
void *internal_object,
void *external_object,
u16 index,
union acpi_generic_state **state_list);
+#endif
union acpi_generic_state *
acpi_ut_create_control_state (
@@ -730,9 +732,11 @@
#define ACPI_ANY_BASE 0
+#ifdef ACPI_FUTURE_USAGE
char *
acpi_ut_strupr (
char *src_string);
+#endif
u8 *
acpi_ut_get_resource_end_tag (
@@ -851,9 +855,11 @@
char *module,
u32 line);
+#ifdef ACPI_FUTURE_USAGE
void
acpi_ut_dump_allocation_info (
void);
+#endif
void
acpi_ut_dump_allocations (
--- linux-2.6.10-rc1-mm4-full/drivers/acpi/utilities/utalloc.c.old 2004-11-10 01:18:42.000000000 +0100
+++ linux-2.6.10-rc1-mm4-full/drivers/acpi/utilities/utalloc.c 2004-11-10 01:07:33.000000000 +0100
@@ -818,7 +818,7 @@
* DESCRIPTION: Print some info about the outstanding allocations.
*
******************************************************************************/
-
+#ifdef ACPI_FUTURE_USAGE
void
acpi_ut_dump_allocation_info (
void)
@@ -864,6 +864,7 @@
*/
return_VOID;
}
+#endif /* ACPI_FUTURE_USAGE */
/*******************************************************************************
--- linux-2.6.10-rc1-mm4-full/drivers/acpi/utilities/utmisc.c.old 2004-11-10 01:23:39.000000000 +0100
+++ linux-2.6.10-rc1-mm4-full/drivers/acpi/utilities/utmisc.c 2004-11-10 01:24:00.000000000 +0100
@@ -488,7 +488,7 @@
* DESCRIPTION: Convert string to uppercase
*
******************************************************************************/
-
+#ifdef ACPI_FUTURE_USAGE
char *
acpi_ut_strupr (
char *src_string)
@@ -508,6 +508,7 @@
return (src_string);
}
+#endif /* ACPI_FUTURE_USAGE */
/*******************************************************************************
--- linux-2.6.10-rc1-mm4-full/include/acpi/platform/acenv.h.old 2004-11-10 01:22:23.000000000 +0100
+++ linux-2.6.10-rc1-mm4-full/include/acpi/platform/acenv.h 2004-11-10 01:23:01.000000000 +0100
@@ -223,7 +223,11 @@
*/
#define ACPI_STRSTR(s1,s2) strstr((s1), (s2))
+
+#ifdef ACPI_FUTURE_USAGE
#define ACPI_STRUPR(s) (void) acpi_ut_strupr ((s))
+#endif
+
#define ACPI_STRLEN(s) (acpi_size) strlen((s))
#define ACPI_STRCPY(d,s) (void) strcpy((d), (s))
#define ACPI_STRNCPY(d,s,n) (void) strncpy((d), (s), (acpi_size)(n))
@@ -287,7 +291,11 @@
#define ACPI_STRSTR(s1,s2) acpi_ut_strstr ((s1), (s2))
+
+#ifdef ACPI_FUTURE_USAGE
#define ACPI_STRUPR(s) (void) acpi_ut_strupr ((s))
+#endif
+
#define ACPI_STRLEN(s) (acpi_size) acpi_ut_strlen ((s))
#define ACPI_STRCPY(d,s) (void) acpi_ut_strcpy ((d), (s))
#define ACPI_STRNCPY(d,s,n) (void) acpi_ut_strncpy ((d), (s), (acpi_size)(n))
--- linux-2.6.10-rc1-mm4-full/drivers/acpi/utilities/utxface.c.old 2004-11-10 01:25:34.000000000 +0100
+++ linux-2.6.10-rc1-mm4-full/drivers/acpi/utilities/utxface.c 2004-11-10 01:28:11.000000000 +0100
@@ -343,6 +343,8 @@
}
+#ifdef ACPI_FUTURE_USAGE
+
/*****************************************************************************
*
* FUNCTION: acpi_subsystem_status
@@ -491,6 +493,8 @@
return AE_OK;
}
+#endif /* ACPI_FUTURE_USAGE */
+
/*****************************************************************************
*
--- linux-2.6.10-rc1-mm4-full/drivers/acpi/resources/Makefile.old 2004-11-10 00:29:46.000000000 +0100
+++ linux-2.6.10-rc1-mm4-full/drivers/acpi/resources/Makefile 2004-11-10 00:30:37.000000000 +0100
@@ -3,6 +3,8 @@
#
obj-y := rsaddr.o rscreate.o rsio.o rslist.o rsmisc.o rsxface.o \
- rscalc.o rsdump.o rsirq.o rsmemory.o rsutils.o
+ rscalc.o rsirq.o rsmemory.o rsutils.o
+
+obj-$(ACPI_FUTURE_USAGE) += rsdump.o
EXTRA_CFLAGS += $(ACPI_CFLAGS)
--- linux-2.6.10-rc1-mm4-full/drivers/acpi/hardware/hwgpe.c.old 2004-11-10 01:56:43.000000000 +0100
+++ linux-2.6.10-rc1-mm4-full/drivers/acpi/hardware/hwgpe.c 2004-11-10 01:57:18.000000000 +0100
@@ -135,7 +135,7 @@
* DESCRIPTION: Return the status of a single GPE.
*
******************************************************************************/
-
+#ifdef ACPI_FUTURE_USAGE
acpi_status
acpi_hw_get_gpe_status (
struct acpi_gpe_event_info *gpe_event_info,
@@ -194,6 +194,7 @@
unlock_and_exit:
return (status);
}
+#endif /* ACPI_FUTURE_USAGE */
/******************************************************************************
--- linux-2.6.10-rc1-mm4-full/drivers/acpi/resources/rsutils.c.old 2004-11-10 02:00:10.000000000 +0100
+++ linux-2.6.10-rc1-mm4-full/drivers/acpi/resources/rsutils.c 2004-11-10 02:00:33.000000000 +0100
@@ -175,7 +175,7 @@
* and the contents of the callers buffer is undefined.
*
******************************************************************************/
-
+#ifdef ACPI_FUTURE_USAGE
acpi_status
acpi_rs_get_prs_method_data (
acpi_handle handle,
@@ -210,6 +210,7 @@
acpi_ut_remove_reference (obj_desc);
return_ACPI_STATUS (status);
}
+#endif /* ACPI_FUTURE_USAGE */
/*******************************************************************************
^ permalink raw reply [flat|nested] 19+ messages in thread