Skip to content

L
linux
Commit d569d6be authored by Len Brown's avatar Len Brown
Browse files
Options

Merge intel.com:/home/lenb/src/26-stable-dev 

into intel.com:/home/lenb/src/26-latest-dev
parents c0273c82 1fbd8e90
Hide whitespace changes
Inline Side-by-side
Showing with 162 additions and 183 deletions
drivers/acpi/acpi_ksyms.c deleted 100644 → 0
View file @ c0273c82
/*
* 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);
#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
drivers/acpi/dispatcher/dsmthdat.c
View file @ d569d6be
......@@ -350,7 +350,7 @@ acpi_ds_method_data_set_value (
* 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 @@ acpi_ds_method_data_get_type (
return_VALUE (ACPI_GET_OBJECT_TYPE (object));
}
#endif /* ACPI_FUTURE_USAGE */
/*******************************************************************************
......
drivers/acpi/dispatcher/dswstate.c
View file @ d569d6be
......@@ -51,6 +51,8 @@
ACPI_MODULE_NAME ("dswstate")
#ifdef ACPI_FUTURE_USAGE
/*******************************************************************************
*
* FUNCTION: acpi_ds_result_insert
......@@ -174,6 +176,8 @@ acpi_ds_result_remove (
return (AE_OK);
}
#endif /* ACPI_FUTURE_USAGE */
/*******************************************************************************
*
......@@ -445,7 +449,7 @@ acpi_ds_result_stack_pop (
* 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 @@ acpi_ds_obj_stack_delete_all (
return_ACPI_STATUS (AE_OK);
}
#endif /* ACPI_FUTURE_USAGE */
/*******************************************************************************
......@@ -687,7 +692,7 @@ acpi_ds_obj_stack_pop_and_delete (
* 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 @@ acpi_ds_obj_stack_get_value (
return_PTR (walk_state->operands[(acpi_native_uint)(walk_state->num_operands - 1) -
index]);
}
#endif /* ACPI_FUTURE_USAGE */
/*******************************************************************************
......
drivers/acpi/events/evxface.c
View file @ d569d6be
......@@ -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 @@ acpi_install_exception_handler (
(void) acpi_ut_release_mutex (ACPI_MTX_EVENTS);
return_ACPI_STATUS (status);
}
#endif /* ACPI_FUTURE_USAGE */
/*******************************************************************************
......
drivers/acpi/events/evxfevnt.c
View file @ d569d6be
......@@ -435,7 +435,7 @@ EXPORT_SYMBOL(acpi_disable_event);
* DESCRIPTION: Clear an ACPI event (fixed)
*
******************************************************************************/
#ifdef ACPI_FUTURE_USAGE
acpi_status
acpi_clear_event (
u32 event)
......@@ -462,6 +462,7 @@ acpi_clear_event (
return_ACPI_STATUS (status);
}
EXPORT_SYMBOL(acpi_clear_event);
#endif /* ACPI_FUTURE_USAGE */
/*******************************************************************************
......@@ -518,6 +519,8 @@ acpi_clear_gpe (
}
#ifdef ACPI_FUTURE_USAGE
/*******************************************************************************
*
* FUNCTION: acpi_get_event_status
......@@ -619,6 +622,7 @@ acpi_get_gpe_status (
}
return_ACPI_STATUS (status);
}
#endif /* ACPI_FUTURE_USAGE */
/*******************************************************************************
......@@ -773,4 +777,3 @@ acpi_remove_gpe_block (
return_ACPI_STATUS (status);
}
EXPORT_SYMBOL(acpi_remove_gpe_block);
drivers/acpi/executer/exdump.c
View file @ d569d6be
......@@ -438,6 +438,8 @@ acpi_ex_dump_operands (
}
#ifdef ACPI_FUTURE_USAGE
/*****************************************************************************
*
* FUNCTION: acpi_ex_out*
......@@ -786,5 +788,7 @@ acpi_ex_dump_object_descriptor (
return_VOID;
}
#endif /* ACPI_FUTURE_USAGE */
#endif
drivers/acpi/hardware/Makefile
View file @ d569d6be
......@@ -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)
drivers/acpi/hardware/hwgpe.c
View file @ d569d6be
......@@ -135,7 +135,7 @@ acpi_hw_clear_gpe (
* 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 @@ acpi_hw_get_gpe_status (
unlock_and_exit:
return (status);
}
#endif /* ACPI_FUTURE_USAGE */
/******************************************************************************
......
drivers/acpi/hardware/hwsleep.c
View file @ d569d6be
......@@ -112,7 +112,7 @@ acpi_set_firmware_waking_vector (
* 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 @@ acpi_get_firmware_waking_vector (
return_ACPI_STATUS (AE_OK);
}
#endif
/******************************************************************************
......
drivers/acpi/namespace/Makefile
View file @ d569d6be
......@@ -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)
drivers/acpi/namespace/nsdump.c
View file @ d569d6be
......@@ -550,6 +550,8 @@ acpi_ns_dump_one_object (
}
#ifdef ACPI_FUTURE_USAGE
/*******************************************************************************
*
* FUNCTION: acpi_ns_dump_objects
......@@ -635,6 +637,8 @@ acpi_ns_dump_tables (
return_VOID;
}
#endif /* ACPI_FUTURE_USAGE */
/*******************************************************************************
*
......
drivers/acpi/namespace/nsload.c
View file @ d569d6be
......@@ -321,6 +321,8 @@ acpi_ns_load_namespace (
}
#ifdef ACPI_FUTURE_USAGE
/*******************************************************************************
*
* FUNCTION: acpi_ns_delete_subtree
......@@ -452,5 +454,7 @@ acpi_ns_unload_namespace (
return_ACPI_STATUS (status);
}
#endif /* ACPI_FUTURE_USAGE */
#endif
drivers/acpi/namespace/nsutils.c
View file @ d569d6be
......@@ -961,7 +961,7 @@ acpi_ns_get_node_by_path (
* (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 @@ acpi_ns_find_parent_name (
return_VALUE (ACPI_UNKNOWN_NAME);
}
#endif
/*******************************************************************************
......
drivers/acpi/namespace/nsxfeval.c
View file @ d569d6be
......@@ -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 @@ acpi_evaluate_object_typed (
return_buffer->length = 0;
return_ACPI_STATUS (AE_TYPE);
}
#endif /* ACPI_FUTURE_USAGE */
/*******************************************************************************
......
drivers/acpi/osl.c
View file @ d569d6be
......@@ -211,6 +211,7 @@ acpi_os_unmap_memory(void __iomem *virt, acpi_size size)
iounmap(virt);
}
#ifdef ACPI_FUTURE_USAGE
acpi_status
acpi_os_get_physical_address(void *virt, acpi_physical_address *phys)
{
......@@ -221,6 +222,7 @@ acpi_os_get_physical_address(void *virt, acpi_physical_address *phys)
return AE_OK;
}
#endif
#define ACPI_MAX_OVERRIDE_LEN 100
......@@ -989,6 +991,7 @@ acpi_os_signal_semaphore(
}
EXPORT_SYMBOL(acpi_os_signal_semaphore);
#ifdef ACPI_FUTURE_USAGE
u32
acpi_os_get_line(char *buffer)
{
......@@ -1007,6 +1010,7 @@ acpi_os_get_line(char *buffer)
return 0;
}
#endif /* ACPI_FUTURE_USAGE */
/* Assumes no unreadable holes inbetween */
u8
......@@ -1019,6 +1023,7 @@ acpi_os_readable(void *ptr, acpi_size len)
return 1;
}
#ifdef ACPI_FUTURE_USAGE
u8
acpi_os_writable(void *ptr, acpi_size len)
{
......@@ -1026,6 +1031,7 @@ acpi_os_writable(void *ptr, acpi_size len)
The later may be difficult at early boot when kmap doesn't work yet. */
return 1;
}
#endif
u32
acpi_os_get_thread_id (void)
......
drivers/acpi/parser/pstree.c
View file @ d569d6be
......@@ -181,6 +181,8 @@ acpi_ps_append_arg (
}
#ifdef ACPI_FUTURE_USAGE
/*******************************************************************************
*
* FUNCTION: acpi_ps_get_child
......@@ -192,7 +194,6 @@ acpi_ps_append_arg (
* 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 @@ acpi_ps_get_depth_next (
return (next);
}
#endif /* ACPI_FUTURE_USAGE */
drivers/acpi/parser/psutils.c
View file @ d569d6be
......@@ -267,6 +267,7 @@ acpi_ps_is_prefix_char (
/*
* 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 @@ acpi_ps_get_name (
return (op->named.name);
}
#endif /* ACPI_FUTURE_USAGE */
/*
......
drivers/acpi/pci_bind.c
View file @ d569d6be
......@@ -67,6 +67,7 @@ acpi_pci_data_handler (
* 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 @@ acpi_os_get_pci_id (
return_ACPI_STATUS(AE_OK);
}
#endif /* ACPI_FUTURE_USAGE */
int
......
drivers/acpi/resources/Makefile
View file @ d569d6be
......@@ -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)
drivers/acpi/resources/rsutils.c
View file @ d569d6be
......@@ -175,7 +175,7 @@ acpi_rs_get_crs_method_data (
* 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_rs_get_prs_method_data (
acpi_ut_remove_reference (obj_desc);
return_ACPI_STATUS (status);
}
#endif /* ACPI_FUTURE_USAGE */
/*******************************************************************************
......
drivers/acpi/resources/rsxface.c
View file @ d569d6be
......@@ -180,7 +180,7 @@ EXPORT_SYMBOL(acpi_get_current_resources);
* 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 @@ acpi_get_possible_resources (
return_ACPI_STATUS (status);
}
EXPORT_SYMBOL(acpi_get_possible_resources);
#endif /* ACPI_FUTURE_USAGE */
/*******************************************************************************
......
drivers/acpi/scan.c
View file @ d569d6be
......@@ -4,6 +4,7 @@
#include <linux/init.h>
#include <linux/acpi.h>
#include <linux/module.h>
#include <acpi/acpi_drivers.h>
#include <acpi/acinterp.h> /* for acpi_ex_eisa_id_to_string() */
......@@ -453,6 +454,7 @@ acpi_bus_register_driver (
return_VALUE(count);
}
EXPORT_SYMBOL(acpi_bus_register_driver);
/**
......@@ -481,6 +483,7 @@ acpi_bus_unregister_driver (
error = -EINVAL;
return_VALUE(error);
}
EXPORT_SYMBOL(acpi_bus_unregister_driver);
/**
* acpi_bus_find_driver
......
drivers/acpi/tables/tbutils.c
View file @ d569d6be
......@@ -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_tb_handle_to_object (
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "table_id=%X does not exist\n", table_id));
return (AE_BAD_PARAMETER);
}
#endif /* ACPI_FUTURE_USAGE */
/*******************************************************************************
......
drivers/acpi/tables/tbxface.c
View file @ d569d6be
......@@ -138,6 +138,8 @@ acpi_load_tables (void)
}
#ifdef ACPI_FUTURE_USAGE
/*******************************************************************************
*
* FUNCTION: acpi_load_table
......@@ -344,6 +346,8 @@ acpi_get_table_header (
}
#endif /* ACPI_FUTURE_USAGE */
/*******************************************************************************
*
* FUNCTION: acpi_get_table
......
drivers/acpi/utilities/utalloc.c
View file @ d569d6be
......@@ -818,7 +818,7 @@ acpi_ut_remove_allocation (
* DESCRIPTION: Print some info about the outstanding allocations.
*
******************************************************************************/
#ifdef ACPI_FUTURE_USAGE
void
acpi_ut_dump_allocation_info (
void)
......@@ -864,6 +864,7 @@ acpi_ut_dump_allocation_info (
*/
return_VOID;
}
#endif /* ACPI_FUTURE_USAGE */
/*******************************************************************************
......
drivers/acpi/utilities/utmisc.c
View file @ d569d6be
......@@ -488,7 +488,7 @@ acpi_ut_strtoul64 (
* DESCRIPTION: Convert string to uppercase
*
******************************************************************************/
#ifdef ACPI_FUTURE_USAGE
char *
acpi_ut_strupr (
char *src_string)
......@@ -508,6 +508,7 @@ acpi_ut_strupr (
return (src_string);
}
#endif /* ACPI_FUTURE_USAGE */
/*******************************************************************************
......
drivers/acpi/utilities/utxface.c
View file @ d569d6be
......@@ -343,6 +343,8 @@ acpi_terminate (void)
}
#ifdef ACPI_FUTURE_USAGE
/*****************************************************************************
*
* FUNCTION: acpi_subsystem_status
......@@ -491,6 +493,8 @@ acpi_install_initialization_handler (
return AE_OK;
}
#endif /* ACPI_FUTURE_USAGE */
/*****************************************************************************
*
......
include/acpi/acdispat.h
View file @ d569d6be
......@@ -62,10 +62,12 @@ acpi_ds_obj_stack_pop (
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 @@ u8
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 @@ acpi_ds_init_aml_walk (
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 @@ void
acpi_ds_delete_walk_state_cache (
void);
#ifdef ACPI_FUTURE_USAGE
acpi_status
acpi_ds_result_insert (
void *object,
......@@ -493,6 +500,7 @@ acpi_ds_result_remove (
union acpi_operand_object **object,
u32 index,
struct acpi_walk_state *walk_state);
#endif
acpi_status
acpi_ds_result_pop (
......
include/acpi/achware.h
View file @ d569d6be
......@@ -131,10 +131,12 @@ acpi_hw_clear_gpe_block (
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_hw_enable_wakeup_gpe_block (
/* ACPI Timer prototypes */
#ifdef ACPI_FUTURE_USAGE
acpi_status
acpi_get_timer_resolution (
u32 *resolution);
......@@ -174,6 +177,6 @@ acpi_get_timer_duration (
u32 start_ticks,
u32 end_ticks,
u32 *time_elapsed);
#endif /* ACPI_FUTURE_USAGE */
#endif /* __ACHWARE_H__ */
include/acpi/acinterp.h
View file @ d569d6be
......@@ -504,6 +504,7 @@ acpi_ex_dump_operands (
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 @@ void
acpi_ex_out_address (
char *title,
acpi_physical_address value);
#endif /* ACPI_FUTURE_USAGE */
/*
* exnames - interpreter/scanner name load/execute
......
include/acpi/acmacros.h
View file @ d569d6be
......@@ -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)
......
include/acpi/acnamesp.h
View file @ d569d6be
......@@ -210,6 +210,7 @@ acpi_ns_remove_reference (
* Namespace modification - nsmodify
*/
#ifdef ACPI_FUTURE_USAGE
acpi_status
acpi_ns_unload_namespace (
acpi_handle handle);
......@@ -217,16 +218,19 @@ acpi_ns_unload_namespace (
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 @@ acpi_ns_print_pathname (
u32 num_segments,
char *pathname);
#ifdef ACPI_FUTURE_USAGE
acpi_status
acpi_ns_dump_one_device (
acpi_handle obj_handle,
......@@ -255,6 +260,7 @@ acpi_ns_dump_one_device (
void
acpi_ns_dump_root_devices (
void);
#endif /* ACPI_FUTURE_USAGE */
acpi_status
acpi_ns_dump_one_object (
......@@ -263,6 +269,7 @@ acpi_ns_dump_one_object (
void *context,
void **return_value);
#ifdef ACPI_FUTURE_USAGE
void
acpi_ns_dump_objects (
acpi_object_type type,
......@@ -270,6 +277,7 @@ acpi_ns_dump_objects (
u32 max_depth,
u32 ownder_id,
acpi_handle start_handle);
#endif
/*
......@@ -303,9 +311,11 @@ acpi_ns_get_object_value (
* Parent/Child/Peer utility functions
*/
#ifdef ACPI_FUTURE_USAGE
acpi_name
acpi_ns_find_parent_name (
struct acpi_namespace_node *node_to_search);
#endif
/*
......
include/acpi/acparser.h
View file @ d569d6be
......@@ -247,6 +247,7 @@ acpi_ps_get_arg(
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 @@ union acpi_parse_object *
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 @@ u8
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(
......
include/acpi/acpiosxf.h
View file @ d569d6be
......@@ -176,10 +176,12 @@ acpi_os_unmap_memory (
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 @@ acpi_os_readable (
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 @@ acpi_os_redirect_output (
* Debug input
*/
#ifdef ACPI_FUTURE_USAGE
u32
acpi_os_get_line (
char *buffer);
#endif
/*
......
include/acpi/acpixf.h
View file @ d569d6be
......@@ -70,9 +70,11 @@ acpi_status
acpi_terminate (
void);
#ifdef ACPI_FUTURE_USAGE
acpi_status
acpi_subsystem_status (
void);
#endif
acpi_status
acpi_enable (
......@@ -82,9 +84,11 @@ acpi_status
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_status
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_status
acpi_load_tables (
void);
#ifdef ACPI_FUTURE_USAGE
acpi_status
acpi_load_table (
struct acpi_table_header *table_ptr);
......@@ -142,6 +149,7 @@ acpi_get_table_header (
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 @@ acpi_evaluate_object (
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 @@ acpi_evaluate_object_typed (
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_install_gpe_handler (
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 @@ acpi_disable_event (
u32 event,
u32 flags);
#ifdef ACPI_FUTURE_USAGE
acpi_status
acpi_clear_event (
u32 event);
......@@ -341,6 +354,7 @@ acpi_status
acpi_get_event_status (
u32 event,
acpi_event_status *event_status);
#endif /* ACPI_FUTURE_USAGE */
acpi_status
acpi_set_gpe_type (
......@@ -366,12 +380,14 @@ acpi_clear_gpe (
u32 gpe_number,
u32 flags);
#ifdef ACPI_FUTURE_USAGE
acpi_status
acpi_get_gpe_status (
acpi_handle gpe_device,
u32 gpe_number,
u32 flags,
acpi_event_status *event_status);
#endif /* ACPI_FUTURE_USAGE */
acpi_status
acpi_install_gpe_block (
......@@ -400,10 +416,12 @@ acpi_get_current_resources(
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_status
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 (
......
include/acpi/acresrc.h
View file @ d569d6be
......@@ -60,10 +60,12 @@ acpi_rs_get_crs_method_data (
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 @@ acpi_rs_create_pci_routing_table (
/*
* 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 @@ acpi_rs_dump_resource_list (
void
acpi_rs_dump_irq_list (
u8 *route_table);
#endif /* ACPI_FUTURE_USAGE */
acpi_status
acpi_rs_get_byte_stream_start (
......
include/acpi/actables.h
View file @ d569d6be
......@@ -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
......
include/acpi/acutils.h
View file @ d569d6be
......@@ -666,12 +666,14 @@ acpi_ut_create_update_state_and_push (
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 @@ acpi_ut_strtoul64 (
#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 @@ acpi_ut_remove_allocation (
char *module,
u32 line);
#ifdef ACPI_FUTURE_USAGE
void
acpi_ut_dump_allocation_info (
void);
#endif
void
acpi_ut_dump_allocations (
......
include/acpi/platform/acenv.h
View file @ d569d6be
......@@ -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 @@ typedef char *va_list;
#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))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7