Commit c0273c82 authored by Len Brown's avatar Len Brown

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

into intel.com:/home/lenb/src/26-latest-dev
parents 8799c57e d337448e
......@@ -12,8 +12,6 @@ endif
EXTRA_CFLAGS += $(ACPI_CFLAGS)
obj-$(CONFIG_ACPI) := acpi_ksyms.o
#
# ACPI Boot-Time Table Parsing
#
......
......@@ -22,6 +22,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
*/
#include <linux/module.h>
#include <linux/init.h>
#include <linux/ioport.h>
#include <linux/list.h>
......@@ -44,8 +45,11 @@ extern void __init acpi_pic_sci_set_trigger(unsigned int irq, u16 trigger);
#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))
......@@ -80,6 +84,7 @@ acpi_bus_get_device (
return_VALUE(0);
}
EXPORT_SYMBOL(acpi_bus_get_device);
int
acpi_bus_get_status (
......@@ -125,6 +130,7 @@ acpi_bus_get_status (
return_VALUE(0);
}
EXPORT_SYMBOL(acpi_bus_get_status);
/* --------------------------------------------------------------------------
......@@ -182,6 +188,7 @@ acpi_bus_get_power (
return_VALUE(0);
}
EXPORT_SYMBOL(acpi_bus_get_power);
int
......@@ -270,6 +277,7 @@ acpi_bus_set_power (
return_VALUE(result);
}
EXPORT_SYMBOL(acpi_bus_set_power);
......@@ -319,6 +327,7 @@ acpi_bus_generate_event (
return_VALUE(0);
}
EXPORT_SYMBOL(acpi_bus_generate_event);
int
acpi_bus_receive_event (
......@@ -364,6 +373,7 @@ acpi_bus_receive_event (
return_VALUE(0);
}
EXPORT_SYMBOL(acpi_bus_receive_event);
/* --------------------------------------------------------------------------
......
......@@ -264,6 +264,7 @@ ec_read(u8 addr, u8 *val)
else
return err;
}
EXPORT_SYMBOL(ec_read);
int
ec_write(u8 addr, u8 val)
......@@ -280,6 +281,7 @@ ec_write(u8 addr, u8 val)
return err;
}
EXPORT_SYMBOL(ec_write);
static int
......
......@@ -41,6 +41,7 @@
* POSSIBILITY OF SUCH DAMAGES.
*/
#include <linux/module.h>
#include <acpi/acpi.h>
#include <acpi/acnamesp.h>
......@@ -166,6 +167,7 @@ acpi_install_fixed_event_handler (
(void) acpi_ut_release_mutex (ACPI_MTX_EVENTS);
return_ACPI_STATUS (status);
}
EXPORT_SYMBOL(acpi_install_fixed_event_handler);
/*******************************************************************************
......@@ -223,6 +225,7 @@ acpi_remove_fixed_event_handler (
(void) acpi_ut_release_mutex (ACPI_MTX_EVENTS);
return_ACPI_STATUS (status);
}
EXPORT_SYMBOL(acpi_remove_fixed_event_handler);
/*******************************************************************************
......@@ -392,6 +395,7 @@ acpi_install_notify_handler (
(void) acpi_ut_release_mutex (ACPI_MTX_NAMESPACE);
return_ACPI_STATUS (status);
}
EXPORT_SYMBOL(acpi_install_notify_handler);
/*******************************************************************************
......@@ -550,6 +554,7 @@ acpi_remove_notify_handler (
(void) acpi_ut_release_mutex (ACPI_MTX_NAMESPACE);
return_ACPI_STATUS (status);
}
EXPORT_SYMBOL(acpi_remove_notify_handler);
/*******************************************************************************
......@@ -647,6 +652,7 @@ acpi_install_gpe_handler (
(void) acpi_ut_release_mutex (ACPI_MTX_EVENTS);
return_ACPI_STATUS (status);
}
EXPORT_SYMBOL(acpi_install_gpe_handler);
/*******************************************************************************
......@@ -749,6 +755,7 @@ acpi_remove_gpe_handler (
(void) acpi_ut_release_mutex (ACPI_MTX_EVENTS);
return_ACPI_STATUS (status);
}
EXPORT_SYMBOL(acpi_remove_gpe_handler);
/*******************************************************************************
......@@ -791,6 +798,7 @@ acpi_acquire_global_lock (
return (status);
}
EXPORT_SYMBOL(acpi_acquire_global_lock);
/*******************************************************************************
......@@ -819,5 +827,5 @@ acpi_release_global_lock (
status = acpi_ev_release_global_lock ();
return (status);
}
EXPORT_SYMBOL(acpi_release_global_lock);
......@@ -41,6 +41,7 @@
* POSSIBILITY OF SUCH DAMAGES.
*/
#include <linux/module.h>
#include <acpi/acpi.h>
#include <acpi/acevents.h>
......@@ -200,6 +201,7 @@ acpi_enable_event (
return_ACPI_STATUS (status);
}
EXPORT_SYMBOL(acpi_enable_event);
/*******************************************************************************
......@@ -248,6 +250,7 @@ acpi_set_gpe_type (
unlock_and_exit:
return_ACPI_STATUS (status);
}
EXPORT_SYMBOL(acpi_set_gpe_type);
/*******************************************************************************
......@@ -305,6 +308,7 @@ acpi_enable_gpe (
}
return_ACPI_STATUS (status);
}
EXPORT_SYMBOL(acpi_enable_gpe);
/*******************************************************************************
......@@ -417,6 +421,7 @@ acpi_disable_event (
return_ACPI_STATUS (status);
}
EXPORT_SYMBOL(acpi_disable_event);
/*******************************************************************************
......@@ -456,6 +461,7 @@ acpi_clear_event (
return_ACPI_STATUS (status);
}
EXPORT_SYMBOL(acpi_clear_event);
/*******************************************************************************
......@@ -705,6 +711,7 @@ acpi_install_gpe_block (
(void) acpi_ut_release_mutex (ACPI_MTX_NAMESPACE);
return_ACPI_STATUS (status);
}
EXPORT_SYMBOL(acpi_install_gpe_block);
/*******************************************************************************
......@@ -765,4 +772,5 @@ acpi_remove_gpe_block (
(void) acpi_ut_release_mutex (ACPI_MTX_NAMESPACE);
return_ACPI_STATUS (status);
}
EXPORT_SYMBOL(acpi_remove_gpe_block);
......@@ -42,6 +42,7 @@
* POSSIBILITY OF SUCH DAMAGES.
*/
#include <linux/module.h>
#include <acpi/acpi.h>
#include <acpi/acnamesp.h>
......@@ -116,6 +117,7 @@ acpi_install_address_space_handler (
(void) acpi_ut_release_mutex (ACPI_MTX_NAMESPACE);
return_ACPI_STATUS (status);
}
EXPORT_SYMBOL(acpi_install_address_space_handler);
/*******************************************************************************
......@@ -241,5 +243,5 @@ acpi_remove_address_space_handler (
(void) acpi_ut_release_mutex (ACPI_MTX_NAMESPACE);
return_ACPI_STATUS (status);
}
EXPORT_SYMBOL(acpi_remove_address_space_handler);
......@@ -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_get_sleep_type_data (
acpi_ut_remove_reference (info.return_object);
return_ACPI_STATUS (status);
}
EXPORT_SYMBOL(acpi_get_sleep_type_data);
/*******************************************************************************
......@@ -307,6 +309,7 @@ acpi_get_register (
return_ACPI_STATUS (status);
}
EXPORT_SYMBOL(acpi_get_register);
/*******************************************************************************
......@@ -457,6 +460,7 @@ acpi_set_register (
value, register_value, bit_reg_info->parent_register));
return_ACPI_STATUS (status);
}
EXPORT_SYMBOL(acpi_set_register);
/******************************************************************************
......
......@@ -42,6 +42,8 @@
* POSSIBILITY OF SUCH DAMAGES.
*/
#include <linux/module.h>
#include <acpi/acpi.h>
#define _COMPONENT ACPI_HARDWARE
......@@ -391,6 +393,7 @@ acpi_enter_sleep_state (
return_ACPI_STATUS (AE_OK);
}
EXPORT_SYMBOL(acpi_enter_sleep_state);
/******************************************************************************
......@@ -456,6 +459,7 @@ acpi_enter_sleep_state_s4bios (
return_ACPI_STATUS (AE_OK);
}
EXPORT_SYMBOL(acpi_enter_sleep_state_s4bios);
/******************************************************************************
......
......@@ -42,6 +42,8 @@
* POSSIBILITY OF SUCH DAMAGES.
*/
#include <linux/module.h>
#include <acpi/acpi.h>
#define _COMPONENT ACPI_HARDWARE
......@@ -112,6 +114,7 @@ acpi_get_timer (
return_ACPI_STATUS (status);
}
EXPORT_SYMBOL(acpi_get_timer);
/******************************************************************************
......@@ -196,5 +199,5 @@ acpi_get_timer_duration (
*time_elapsed = (u32) quotient;
return_ACPI_STATUS (status);
}
EXPORT_SYMBOL(acpi_get_timer_duration);
......@@ -42,6 +42,7 @@
* POSSIBILITY OF SUCH DAMAGES.
*/
#include <linux/module.h>
#include <acpi/acpi.h>
#include <acpi/acnamesp.h>
......@@ -354,6 +355,7 @@ acpi_evaluate_object (
return_ACPI_STATUS (status);
}
EXPORT_SYMBOL(acpi_evaluate_object);
/*******************************************************************************
......@@ -426,6 +428,7 @@ acpi_walk_namespace (
(void) acpi_ut_release_mutex (ACPI_MTX_NAMESPACE);
return_ACPI_STATUS (status);
}
EXPORT_SYMBOL(acpi_walk_namespace);
/*******************************************************************************
......@@ -599,6 +602,7 @@ acpi_get_devices (
(void) acpi_ut_release_mutex (ACPI_MTX_NAMESPACE);
return_ACPI_STATUS (status);
}
EXPORT_SYMBOL(acpi_get_devices);
/*******************************************************************************
......
......@@ -42,6 +42,7 @@
* POSSIBILITY OF SUCH DAMAGES.
*/
#include <linux/module.h>
#include <acpi/acpi.h>
#include <acpi/acnamesp.h>
......@@ -129,6 +130,7 @@ acpi_get_handle (
return (status);
}
EXPORT_SYMBOL(acpi_get_handle);
/******************************************************************************
......@@ -210,6 +212,7 @@ acpi_get_name (
(void) acpi_ut_release_mutex (ACPI_MTX_NAMESPACE);
return (status);
}
EXPORT_SYMBOL(acpi_get_name);
/******************************************************************************
......@@ -359,4 +362,5 @@ acpi_get_object_info (
}
return (status);
}
EXPORT_SYMBOL(acpi_get_object_info);
......@@ -42,6 +42,7 @@
* POSSIBILITY OF SUCH DAMAGES.
*/
#include <linux/module.h>
#include <acpi/acpi.h>
#include <acpi/acnamesp.h>
......@@ -106,6 +107,7 @@ acpi_get_type (
status = acpi_ut_release_mutex (ACPI_MTX_NAMESPACE);
return (status);
}
EXPORT_SYMBOL(acpi_get_type);
/*******************************************************************************
......@@ -171,6 +173,7 @@ acpi_get_parent (
(void) acpi_ut_release_mutex (ACPI_MTX_NAMESPACE);
return (status);
}
EXPORT_SYMBOL(acpi_get_parent);
/*******************************************************************************
......@@ -255,5 +258,5 @@ acpi_get_next_object (
(void) acpi_ut_release_mutex (ACPI_MTX_NAMESPACE);
return (status);
}
EXPORT_SYMBOL(acpi_get_next_object);
......@@ -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 @@ struct acpi_os_dpc
#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_printf(const char *fmt,...)
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 @@ acpi_os_free(void *ptr)
{
kfree(ptr);
}
EXPORT_SYMBOL(acpi_os_free);
acpi_status
acpi_os_get_root_pointer(u32 flags, struct acpi_pointer *addr)
......@@ -311,6 +317,7 @@ acpi_os_sleep(acpi_integer ms)
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 @@ acpi_os_stall(u32 us)
us -= delay;
}
}
EXPORT_SYMBOL(acpi_os_stall);
/*
* Support ACPI 3.0 AML Timer operand
......@@ -377,6 +385,7 @@ acpi_os_read_port(
return AE_OK;
}
EXPORT_SYMBOL(acpi_os_read_port);
acpi_status
acpi_os_write_port(
......@@ -401,6 +410,7 @@ acpi_os_write_port(
return AE_OK;
}
EXPORT_SYMBOL(acpi_os_write_port);
acpi_status
acpi_os_read_memory(
......@@ -519,6 +529,7 @@ acpi_os_read_pci_configuration (struct acpi_pci_id *pci_id, u32 reg, void *value
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 @@ acpi_os_queue_for_execution(
return_ACPI_STATUS (status);
}
EXPORT_SYMBOL(acpi_os_queue_for_execution);
void
acpi_os_wait_events_complete(
......@@ -719,6 +731,7 @@ acpi_os_wait_events_complete(
{
flush_workqueue(kacpid_wq);
}
EXPORT_SYMBOL(acpi_os_wait_events_complete);
/*
* Allocate the memory for a spinlock and initialize it.
......@@ -830,6 +843,7 @@ acpi_os_create_semaphore(
return_ACPI_STATUS (AE_OK);
}
EXPORT_SYMBOL(acpi_os_create_semaphore);
/*
......@@ -856,6 +870,7 @@ acpi_os_delete_semaphore(
return_ACPI_STATUS (AE_OK);
}
EXPORT_SYMBOL(acpi_os_delete_semaphore);
/*
......@@ -945,6 +960,7 @@ acpi_os_wait_semaphore(
return_ACPI_STATUS (status);
}
EXPORT_SYMBOL(acpi_os_wait_semaphore);
/*
......@@ -971,6 +987,7 @@ acpi_os_signal_semaphore(
return_ACPI_STATUS (AE_OK);
}
EXPORT_SYMBOL(acpi_os_signal_semaphore);
u32
acpi_os_get_line(char *buffer)
......@@ -1045,6 +1062,7 @@ acpi_os_signal (
return AE_OK;
}
EXPORT_SYMBOL(acpi_os_signal);
int __init
acpi_os_name_setup(char *str)
......
......@@ -405,3 +405,5 @@ acpi_pci_irq_enable (
return_VALUE(0);
}
EXPORT_SYMBOL(acpi_pci_irq_enable);
......@@ -90,6 +90,7 @@ int acpi_pci_register_driver(struct acpi_pci_driver *driver)
return n;
}
EXPORT_SYMBOL(acpi_pci_register_driver);
void acpi_pci_unregister_driver(struct acpi_pci_driver *driver)
{
......@@ -112,6 +113,7 @@ void acpi_pci_unregister_driver(struct acpi_pci_driver *driver)
driver->remove(root->handle);
}
}
EXPORT_SYMBOL(acpi_pci_unregister_driver);
static acpi_status
get_root_bridge_busnr_callback (struct acpi_resource *resource, void *data)
......
......@@ -41,6 +41,7 @@
* POSSIBILITY OF SUCH DAMAGES.
*/
#include <linux/module.h>
#include <acpi/acpi.h>
#include <acpi/acresrc.h>
......@@ -156,6 +157,7 @@ acpi_get_current_resources (
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 @@ acpi_get_possible_resources (
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_walk_resources (
acpi_os_free (buffer.pointer);
return_ACPI_STATUS (status);
}
EXPORT_SYMBOL(acpi_walk_resources);
/*******************************************************************************
......@@ -354,6 +358,7 @@ acpi_set_current_resources (
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 @@ acpi_resource_to_address64 (
return (AE_OK);
}
EXPORT_SYMBOL(acpi_resource_to_address64);
......@@ -761,7 +761,7 @@ void acpi_device_get_debug_info(struct acpi_device * device, acpi_handle handle,
#endif /*CONFIG_ACPI_DEBUG_OUTPUT*/
}
static int
int
acpi_bus_add (
struct acpi_device **child,
struct acpi_device *parent,
......@@ -905,7 +905,7 @@ acpi_bus_add (
return_VALUE(result);
}
EXPORT_SYMBOL(acpi_bus_add);
static int acpi_bus_scan (struct acpi_device *start)
......@@ -1009,6 +1009,7 @@ static int acpi_bus_scan (struct acpi_device *start)
return_VALUE(0);
}
EXPORT_SYMBOL(acpi_bus_register_driver);
static int
......@@ -1036,6 +1037,7 @@ acpi_bus_scan_fixed (
return_VALUE(result);
}
EXPORT_SYMBOL(acpi_bus_unregister_driver);
static int __init acpi_scan_init(void)
......@@ -1070,5 +1072,6 @@ static int __init acpi_scan_init(void)
Done:
return_VALUE(result);
}
EXPORT_SYMBOL(acpi_bus_scan);
subsys_initcall(acpi_scan_init);
......@@ -41,6 +41,7 @@
* POSSIBILITY OF SUCH DAMAGES.
*/
#include <linux/module.h>
#include <acpi/acpi.h>
#include <acpi/actables.h>
......
......@@ -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_get_table (
ACPI_MEMCPY ((void *) ret_buffer->pointer, (void *) tbl_ptr, table_length);
return_ACPI_STATUS (AE_OK);
}
EXPORT_SYMBOL(acpi_get_table);
......@@ -41,6 +41,7 @@
* POSSIBILITY OF SUCH DAMAGES.
*/
#include <linux/module.h>
#include <acpi/acpi.h>
#include <acpi/actables.h>
......@@ -321,6 +322,7 @@ acpi_get_firmware_table (
}
return_ACPI_STATUS (status);
}
EXPORT_SYMBOL(acpi_get_firmware_table);
/* TBD: Move to a new file */
......
......@@ -41,6 +41,7 @@
* POSSIBILITY OF SUCH DAMAGES.
*/
#include <linux/module.h>
#include <acpi/acpi.h>
......@@ -178,6 +179,7 @@ acpi_ut_debug_print (
va_start (args, format);
acpi_os_vprintf (format, args);
}
EXPORT_SYMBOL(acpi_ut_debug_print);
/*****************************************************************************
......@@ -219,6 +221,7 @@ acpi_ut_debug_print_raw (
va_start (args, format);
acpi_os_vprintf (format, args);
}
EXPORT_SYMBOL(acpi_ut_debug_print_raw);
/*****************************************************************************
......@@ -250,6 +253,7 @@ acpi_ut_trace (
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_ut_exit (
acpi_gbl_nesting_level--;
}
EXPORT_SYMBOL(acpi_ut_exit);
/*****************************************************************************
......@@ -418,6 +423,7 @@ acpi_ut_status_exit (
acpi_gbl_nesting_level--;
}
EXPORT_SYMBOL(acpi_ut_status_exit);
/*****************************************************************************
......@@ -451,6 +457,7 @@ acpi_ut_value_exit (
acpi_gbl_nesting_level--;
}
EXPORT_SYMBOL(acpi_ut_value_exit);
/*****************************************************************************
......
......@@ -43,6 +43,8 @@
#define DEFINE_ACPI_GLOBALS
#include <linux/module.h>
#include <acpi/acpi.h>
#include <acpi/acnamesp.h>
......@@ -143,10 +145,12 @@ acpi_format_exception (
/* 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;
......
......@@ -41,6 +41,7 @@
* POSSIBILITY OF SUCH DAMAGES.
*/
#include <linux/module.h>
#include <acpi/acpi.h>
#include <acpi/acevents.h>
......@@ -455,6 +456,7 @@ acpi_get_system_info (
return_ACPI_STATUS (AE_OK);
}
EXPORT_SYMBOL(acpi_get_system_info);
/*****************************************************************************
......
......@@ -233,6 +233,7 @@ acpi_extract_package (
return_ACPI_STATUS(AE_OK);
}
EXPORT_SYMBOL(acpi_extract_package);
acpi_status
......@@ -268,6 +269,7 @@ acpi_evaluate_integer (
return_ACPI_STATUS(AE_OK);
}
EXPORT_SYMBOL(acpi_evaluate_integer);
#if 0
......@@ -409,5 +411,5 @@ acpi_evaluate_reference (
return_ACPI_STATUS(status);
}
EXPORT_SYMBOL(acpi_evaluate_reference);
......@@ -54,8 +54,8 @@
#define ACPI_VIDEO_NOTIFY_DISPLAY_OFF 0x86
#define ACPI_VIDEO_HEAD_INVALID (~0ul - 1)
#define ACPI_VIDEO_HEAD_END (~0ul)
#define ACPI_VIDEO_HEAD_INVALID (~0u - 1)
#define ACPI_VIDEO_HEAD_END (~0u)
#define _COMPONENT ACPI_VIDEO_COMPONENT
......
......@@ -386,11 +386,6 @@ void ACPI_SYSTEM_XFACE
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);
......
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