Skip to content

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

Merge branches 'release' and 'fluff' into release 

Conflicts:

	drivers/acpi/scan.c
	include/linux/acpi.h
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parents 299cfe38 299cfe38 9e527971
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 73 deletions
arch/ia64/kernel/acpi.c
View file @ a733a5da
...@@ -615,8 +615,6 @@ int acpi_register_gsi(u32 gsi, int triggering, int polarity) ...@@ -615,8 +615,6 @@ int acpi_register_gsi(u32 gsi, int triggering, int polarity)
IOSAPIC_LEVEL); IOSAPIC_LEVEL);
} }
EXPORT_SYMBOL(acpi_register_gsi);
void acpi_unregister_gsi(u32 gsi) void acpi_unregister_gsi(u32 gsi)
{ {
if (acpi_irq_model == ACPI_IRQ_MODEL_PLATFORM) if (acpi_irq_model == ACPI_IRQ_MODEL_PLATFORM)
...@@ -625,8 +623,6 @@ void acpi_unregister_gsi(u32 gsi) ...@@ -625,8 +623,6 @@ void acpi_unregister_gsi(u32 gsi)
iosapic_unregister_intr(gsi); iosapic_unregister_intr(gsi);
} }
EXPORT_SYMBOL(acpi_unregister_gsi);
static int __init acpi_parse_fadt(struct acpi_table_header *table) static int __init acpi_parse_fadt(struct acpi_table_header *table)
{ {
struct acpi_table_header *fadt_header; struct acpi_table_header *fadt_header;
......
arch/x86/kernel/acpi/boot.c
View file @ a733a5da
...@@ -78,7 +78,6 @@ int acpi_ht __initdata = 1; /* enable HT */ ...@@ -78,7 +78,6 @@ int acpi_ht __initdata = 1; /* enable HT */
int acpi_lapic; int acpi_lapic;
int acpi_ioapic; int acpi_ioapic;
int acpi_strict; int acpi_strict;
EXPORT_SYMBOL(acpi_strict);
u8 acpi_sci_flags __initdata; u8 acpi_sci_flags __initdata;
int acpi_sci_override_gsi __initdata; int acpi_sci_override_gsi __initdata;
...@@ -490,8 +489,6 @@ int acpi_register_gsi(u32 gsi, int triggering, int polarity) ...@@ -490,8 +489,6 @@ int acpi_register_gsi(u32 gsi, int triggering, int polarity)
return irq; return irq;
} }
EXPORT_SYMBOL(acpi_register_gsi);
/* /*
* ACPI based hotplug support for CPU * ACPI based hotplug support for CPU
*/ */
......
drivers/acpi/Kconfig
View file @ a733a5da
...@@ -68,26 +68,28 @@ config ACPI_PROCFS ...@@ -68,26 +68,28 @@ config ACPI_PROCFS
Say N to delete /proc/acpi/ files that have moved to /sys/ Say N to delete /proc/acpi/ files that have moved to /sys/
config ACPI_PROCFS_POWER config ACPI_PROCFS_POWER
bool "Deprecated power /proc/acpi folders" bool "Deprecated power /proc/acpi directories"
depends on PROC_FS depends on PROC_FS
default y default y
---help--- ---help---
For backwards compatibility, this option allows For backwards compatibility, this option allows
deprecated power /proc/acpi/ folders to exist, even when deprecated power /proc/acpi/ directories to exist, even when
they have been replaced by functions in /sys. they have been replaced by functions in /sys.
The deprecated folders (and their replacements) include: The deprecated directories (and their replacements) include:
/proc/acpi/battery/* (/sys/class/power_supply/*) /proc/acpi/battery/* (/sys/class/power_supply/*)
/proc/acpi/ac_adapter/* (sys/class/power_supply/*) /proc/acpi/ac_adapter/* (sys/class/power_supply/*)
This option has no effect on /proc/acpi/ folders This option has no effect on /proc/acpi/ directories
and functions, which do not yet exist in /sys and functions, which do not yet exist in /sys
Say N to delete power /proc/acpi/ folders that have moved to /sys/ Say N to delete power /proc/acpi/ directories that have moved to /sys/
config ACPI_SYSFS_POWER config ACPI_SYSFS_POWER
bool "Future power /sys interface" bool "Future power /sys interface"
select POWER_SUPPLY select POWER_SUPPLY
default y default y
---help--- ---help---
Say N to disable power /sys interface Say N to disable power /sys interface
config ACPI_PROC_EVENT config ACPI_PROC_EVENT
bool "Deprecated /proc/acpi/event support" bool "Deprecated /proc/acpi/event support"
depends on PROC_FS depends on PROC_FS
......
drivers/acpi/bay.c
View file @ a733a5da
...@@ -134,7 +134,7 @@ static ssize_t show_present(struct device *dev, ...@@ -134,7 +134,7 @@ static ssize_t show_present(struct device *dev,
return snprintf(buf, PAGE_SIZE, "%d\n", bay_present(bay)); return snprintf(buf, PAGE_SIZE, "%d\n", bay_present(bay));
} }
DEVICE_ATTR(present, S_IRUGO, show_present, NULL); static DEVICE_ATTR(present, S_IRUGO, show_present, NULL);
/* /*
* write_eject - write method for "eject" file in sysfs * write_eject - write method for "eject" file in sysfs
...@@ -150,7 +150,7 @@ static ssize_t write_eject(struct device *dev, struct device_attribute *attr, ...@@ -150,7 +150,7 @@ static ssize_t write_eject(struct device *dev, struct device_attribute *attr,
eject_device(bay->handle); eject_device(bay->handle);
return count; return count;
} }
DEVICE_ATTR(eject, S_IWUSR, NULL, write_eject); static DEVICE_ATTR(eject, S_IWUSR, NULL, write_eject);
/** /**
* is_ata - see if a device is an ata device * is_ata - see if a device is an ata device
......
drivers/acpi/bus.c
View file @ a733a5da
...@@ -391,7 +391,6 @@ int acpi_bus_receive_event(struct acpi_bus_event *event) ...@@ -391,7 +391,6 @@ int acpi_bus_receive_event(struct acpi_bus_event *event)
return 0; return 0;
} }
EXPORT_SYMBOL(acpi_bus_receive_event);
#endif /* CONFIG_ACPI_PROC_EVENT */ #endif /* CONFIG_ACPI_PROC_EVENT */
/* -------------------------------------------------------------------------- /* --------------------------------------------------------------------------
......
drivers/acpi/dock.c
View file @ a733a5da
...@@ -686,7 +686,7 @@ static ssize_t show_docked(struct device *dev, ...@@ -686,7 +686,7 @@ static ssize_t show_docked(struct device *dev,
return snprintf(buf, PAGE_SIZE, "%d\n", dock_present(dock_station)); return snprintf(buf, PAGE_SIZE, "%d\n", dock_present(dock_station));
} }
DEVICE_ATTR(docked, S_IRUGO, show_docked, NULL); static DEVICE_ATTR(docked, S_IRUGO, show_docked, NULL);
/* /*
* show_flags - read method for flags file in sysfs * show_flags - read method for flags file in sysfs
...@@ -697,7 +697,7 @@ static ssize_t show_flags(struct device *dev, ...@@ -697,7 +697,7 @@ static ssize_t show_flags(struct device *dev,
return snprintf(buf, PAGE_SIZE, "%d\n", dock_station->flags); return snprintf(buf, PAGE_SIZE, "%d\n", dock_station->flags);
} }
DEVICE_ATTR(flags, S_IRUGO, show_flags, NULL); static DEVICE_ATTR(flags, S_IRUGO, show_flags, NULL);
/* /*
* write_undock - write method for "undock" file in sysfs * write_undock - write method for "undock" file in sysfs
...@@ -713,7 +713,7 @@ static ssize_t write_undock(struct device *dev, struct device_attribute *attr, ...@@ -713,7 +713,7 @@ static ssize_t write_undock(struct device *dev, struct device_attribute *attr,
ret = handle_eject_request(dock_station, ACPI_NOTIFY_EJECT_REQUEST); ret = handle_eject_request(dock_station, ACPI_NOTIFY_EJECT_REQUEST);
return ret ? ret: count; return ret ? ret: count;
} }
DEVICE_ATTR(undock, S_IWUSR, NULL, write_undock); static DEVICE_ATTR(undock, S_IWUSR, NULL, write_undock);
/* /*
* show_dock_uid - read method for "uid" file in sysfs * show_dock_uid - read method for "uid" file in sysfs
...@@ -729,7 +729,7 @@ static ssize_t show_dock_uid(struct device *dev, ...@@ -729,7 +729,7 @@ static ssize_t show_dock_uid(struct device *dev,
return snprintf(buf, PAGE_SIZE, "%lx\n", lbuf); return snprintf(buf, PAGE_SIZE, "%lx\n", lbuf);
} }
DEVICE_ATTR(uid, S_IRUGO, show_dock_uid, NULL); static DEVICE_ATTR(uid, S_IRUGO, show_dock_uid, NULL);
/** /**
* dock_add - add a new dock station * dock_add - add a new dock station
......
drivers/acpi/glue.c
View file @ a733a5da
...@@ -36,8 +36,6 @@ int register_acpi_bus_type(struct acpi_bus_type *type) ...@@ -36,8 +36,6 @@ int register_acpi_bus_type(struct acpi_bus_type *type)
return -ENODEV; return -ENODEV;
} }
EXPORT_SYMBOL(register_acpi_bus_type);
int unregister_acpi_bus_type(struct acpi_bus_type *type) int unregister_acpi_bus_type(struct acpi_bus_type *type)
{ {
if (acpi_disabled) if (acpi_disabled)
...@@ -53,8 +51,6 @@ int unregister_acpi_bus_type(struct acpi_bus_type *type) ...@@ -53,8 +51,6 @@ int unregister_acpi_bus_type(struct acpi_bus_type *type)
return -ENODEV; return -ENODEV;
} }
EXPORT_SYMBOL(unregister_acpi_bus_type);
static struct acpi_bus_type *acpi_get_bus_type(struct bus_type *type) static struct acpi_bus_type *acpi_get_bus_type(struct bus_type *type)
{ {
struct acpi_bus_type *tmp, *ret = NULL; struct acpi_bus_type *tmp, *ret = NULL;
......
drivers/acpi/numa.c
View file @ a733a5da
...@@ -78,6 +78,7 @@ int acpi_map_pxm_to_node(int pxm) ...@@ -78,6 +78,7 @@ int acpi_map_pxm_to_node(int pxm)
return node; return node;
} }
#if 0
void __cpuinit acpi_unmap_pxm_to_node(int node) void __cpuinit acpi_unmap_pxm_to_node(int node)
{ {
int pxm = node_to_pxm_map[node]; int pxm = node_to_pxm_map[node];
...@@ -85,6 +86,7 @@ void __cpuinit acpi_unmap_pxm_to_node(int node) ...@@ -85,6 +86,7 @@ void __cpuinit acpi_unmap_pxm_to_node(int node)
node_to_pxm_map[node] = PXM_INVAL; node_to_pxm_map[node] = PXM_INVAL;
node_clear(node, nodes_found_map); node_clear(node, nodes_found_map);
} }
#endif /* 0 */
static void __init static void __init
acpi_table_print_srat_entry(struct acpi_subtable_header *header) acpi_table_print_srat_entry(struct acpi_subtable_header *header)
...@@ -247,7 +249,6 @@ int acpi_get_pxm(acpi_handle h) ...@@ -247,7 +249,6 @@ int acpi_get_pxm(acpi_handle h)
} while (ACPI_SUCCESS(status)); } while (ACPI_SUCCESS(status));
return -1; return -1;
} }
EXPORT_SYMBOL(acpi_get_pxm);
int acpi_get_node(acpi_handle *handle) int acpi_get_node(acpi_handle *handle)
{ {
......
drivers/acpi/osl.c
View file @ a733a5da
...@@ -233,8 +233,6 @@ void acpi_os_printf(const char *fmt, ...) ...@@ -233,8 +233,6 @@ void acpi_os_printf(const char *fmt, ...)
va_end(args); va_end(args);
} }
EXPORT_SYMBOL(acpi_os_printf);
void acpi_os_vprintf(const char *fmt, va_list args) void acpi_os_vprintf(const char *fmt, va_list args)
{ {
static char buffer[512]; static char buffer[512];
...@@ -413,8 +411,6 @@ void acpi_os_sleep(acpi_integer ms) ...@@ -413,8 +411,6 @@ void acpi_os_sleep(acpi_integer ms)
schedule_timeout_interruptible(msecs_to_jiffies(ms)); schedule_timeout_interruptible(msecs_to_jiffies(ms));
} }
EXPORT_SYMBOL(acpi_os_sleep);
void acpi_os_stall(u32 us) void acpi_os_stall(u32 us)
{ {
while (us) { while (us) {
...@@ -428,8 +424,6 @@ void acpi_os_stall(u32 us) ...@@ -428,8 +424,6 @@ void acpi_os_stall(u32 us)
} }
} }
EXPORT_SYMBOL(acpi_os_stall);
/* /*
* Support ACPI 3.0 AML Timer operand * Support ACPI 3.0 AML Timer operand
* Returns 64-bit free-running, monotonically increasing timer * Returns 64-bit free-running, monotonically increasing timer
...@@ -579,8 +573,6 @@ acpi_os_read_pci_configuration(struct acpi_pci_id * pci_id, u32 reg, ...@@ -579,8 +573,6 @@ acpi_os_read_pci_configuration(struct acpi_pci_id * pci_id, u32 reg,
return (result ? AE_ERROR : AE_OK); return (result ? AE_ERROR : AE_OK);
} }
EXPORT_SYMBOL(acpi_os_read_pci_configuration);
acpi_status acpi_status
acpi_os_write_pci_configuration(struct acpi_pci_id * pci_id, u32 reg, acpi_os_write_pci_configuration(struct acpi_pci_id * pci_id, u32 reg,
acpi_integer value, u32 width) acpi_integer value, u32 width)
...@@ -796,8 +788,6 @@ acpi_os_create_semaphore(u32 max_units, u32 initial_units, acpi_handle * handle) ...@@ -796,8 +788,6 @@ acpi_os_create_semaphore(u32 max_units, u32 initial_units, acpi_handle * handle)
return AE_OK; return AE_OK;
} }
EXPORT_SYMBOL(acpi_os_create_semaphore);
/* /*
* TODO: A better way to delete semaphores? Linux doesn't have a * TODO: A better way to delete semaphores? Linux doesn't have a
* 'delete_semaphore()' function -- may result in an invalid * 'delete_semaphore()' function -- may result in an invalid
...@@ -821,8 +811,6 @@ acpi_status acpi_os_delete_semaphore(acpi_handle handle) ...@@ -821,8 +811,6 @@ acpi_status acpi_os_delete_semaphore(acpi_handle handle)
return AE_OK; return AE_OK;
} }
EXPORT_SYMBOL(acpi_os_delete_semaphore);
/* /*
* TODO: The kernel doesn't have a 'down_timeout' function -- had to * TODO: The kernel doesn't have a 'down_timeout' function -- had to
* improvise. The process is to sleep for one scheduler quantum * improvise. The process is to sleep for one scheduler quantum
...@@ -915,8 +903,6 @@ acpi_status acpi_os_wait_semaphore(acpi_handle handle, u32 units, u16 timeout) ...@@ -915,8 +903,6 @@ acpi_status acpi_os_wait_semaphore(acpi_handle handle, u32 units, u16 timeout)
return status; return status;
} }
EXPORT_SYMBOL(acpi_os_wait_semaphore);
/* /*
* TODO: Support for units > 1? * TODO: Support for units > 1?
*/ */
...@@ -939,8 +925,6 @@ acpi_status acpi_os_signal_semaphore(acpi_handle handle, u32 units) ...@@ -939,8 +925,6 @@ acpi_status acpi_os_signal_semaphore(acpi_handle handle, u32 units)
return AE_OK; return AE_OK;
} }
EXPORT_SYMBOL(acpi_os_signal_semaphore);
#ifdef ACPI_FUTURE_USAGE #ifdef ACPI_FUTURE_USAGE
u32 acpi_os_get_line(char *buffer) u32 acpi_os_get_line(char *buffer)
{ {
...@@ -984,8 +968,6 @@ acpi_status acpi_os_signal(u32 function, void *info) ...@@ -984,8 +968,6 @@ acpi_status acpi_os_signal(u32 function, void *info)
return AE_OK; return AE_OK;
} }
EXPORT_SYMBOL(acpi_os_signal);
static int __init acpi_os_name_setup(char *str) static int __init acpi_os_name_setup(char *str)
{ {
char *p = acpi_os_name; char *p = acpi_os_name;
......
drivers/acpi/pci_bind.c
View file @ a733a5da
...@@ -44,6 +44,8 @@ struct acpi_pci_data { ...@@ -44,6 +44,8 @@ struct acpi_pci_data {
struct pci_dev *dev; struct pci_dev *dev;
}; };
static int acpi_pci_unbind(struct acpi_device *device);
static void acpi_pci_data_handler(acpi_handle handle, u32 function, static void acpi_pci_data_handler(acpi_handle handle, u32 function,
void *context) void *context)
{ {
...@@ -267,7 +269,7 @@ int acpi_pci_bind(struct acpi_device *device) ...@@ -267,7 +269,7 @@ int acpi_pci_bind(struct acpi_device *device)
return result; return result;
} }
int acpi_pci_unbind(struct acpi_device *device) static int acpi_pci_unbind(struct acpi_device *device)
{ {
int result = 0; int result = 0;
acpi_status status = AE_OK; acpi_status status = AE_OK;
......
drivers/acpi/pci_irq.c
View file @ a733a5da
...@@ -475,8 +475,6 @@ int acpi_pci_irq_enable(struct pci_dev *dev) ...@@ -475,8 +475,6 @@ int acpi_pci_irq_enable(struct pci_dev *dev)
return 0; return 0;
} }
EXPORT_SYMBOL(acpi_pci_irq_enable);
/* FIXME: implement x86/x86_64 version */ /* FIXME: implement x86/x86_64 version */
void __attribute__ ((weak)) acpi_unregister_gsi(u32 i) void __attribute__ ((weak)) acpi_unregister_gsi(u32 i)
{ {
......
drivers/acpi/pci_link.c
View file @ a733a5da
...@@ -95,7 +95,7 @@ static struct { ...@@ -95,7 +95,7 @@ static struct {
int count; int count;
struct list_head entries; struct list_head entries;
} acpi_link; } acpi_link;
DEFINE_MUTEX(acpi_link_lock); static DEFINE_MUTEX(acpi_link_lock);
/* -------------------------------------------------------------------------- /* --------------------------------------------------------------------------
PCI Link Device Management PCI Link Device Management
......
drivers/acpi/sbs.c
View file @ a733a5da
...@@ -888,7 +888,7 @@ static void acpi_charger_remove(struct acpi_sbs *sbs) ...@@ -888,7 +888,7 @@ static void acpi_charger_remove(struct acpi_sbs *sbs)
#endif #endif
} }
void acpi_sbs_callback(void *context) static void acpi_sbs_callback(void *context)
{ {
int id; int id;
struct acpi_sbs *sbs = context; struct acpi_sbs *sbs = context;
......
drivers/acpi/sbshc.c
View file @ a733a5da
...@@ -111,8 +111,8 @@ static int wait_transaction_complete(struct acpi_smb_hc *hc, int timeout) ...@@ -111,8 +111,8 @@ static int wait_transaction_complete(struct acpi_smb_hc *hc, int timeout)
return -ETIME; return -ETIME;
} }
int acpi_smbus_transaction(struct acpi_smb_hc *hc, u8 protocol, u8 address, static int acpi_smbus_transaction(struct acpi_smb_hc *hc, u8 protocol,
u8 command, u8 *data, u8 length) u8 address, u8 command, u8 *data, u8 length)
{ {
int ret = -EFAULT, i; int ret = -EFAULT, i;
u8 temp, sz = 0; u8 temp, sz = 0;
......
drivers/acpi/scan.c
View file @ a733a5da
...@@ -59,7 +59,7 @@ static int create_modalias(struct acpi_device *acpi_dev, char *modalias, ...@@ -59,7 +59,7 @@ static int create_modalias(struct acpi_device *acpi_dev, char *modalias,
count = snprintf(&modalias[len], size, "%s:", count = snprintf(&modalias[len], size, "%s:",
cid_list->id[i].value); cid_list->id[i].value);
if (count < 0 || count >= size) { if (count < 0 || count >= size) {
printk(KERN_ERR "acpi: %s cid[%i] exceeds event buffer size", printk(KERN_ERR PREFIX "%s cid[%i] exceeds event buffer size",
acpi_dev->pnp.device_name, i); acpi_dev->pnp.device_name, i);
break; break;
} }
...@@ -453,7 +453,7 @@ static int acpi_device_register(struct acpi_device *device, ...@@ -453,7 +453,7 @@ static int acpi_device_register(struct acpi_device *device,
device->dev.release = &acpi_device_release; device->dev.release = &acpi_device_release;
result = device_add(&device->dev); result = device_add(&device->dev);
if(result) { if(result) {
printk("Error adding device %s", device->dev.bus_id); printk(KERN_ERR PREFIX "Error adding device %s", device->dev.bus_id);
goto end; goto end;
} }
...@@ -966,7 +966,7 @@ static void acpi_device_set_id(struct acpi_device *device, ...@@ -966,7 +966,7 @@ static void acpi_device_set_id(struct acpi_device *device,
case ACPI_BUS_TYPE_DEVICE: case ACPI_BUS_TYPE_DEVICE:
status = acpi_get_object_info(handle, &buffer); status = acpi_get_object_info(handle, &buffer);
if (ACPI_FAILURE(status)) { if (ACPI_FAILURE(status)) {
printk("%s: Error reading device info\n", __FUNCTION__); printk(KERN_ERR PREFIX "%s: Error reading device info\n", __FUNCTION__);
return; return;
} }
...@@ -1072,7 +1072,7 @@ static void acpi_device_set_id(struct acpi_device *device, ...@@ -1072,7 +1072,7 @@ static void acpi_device_set_id(struct acpi_device *device,
list->count = count; list->count = count;
device->pnp.cid_list = list; device->pnp.cid_list = list;
} else } else
printk(KERN_ERR "Memory allocation error\n"); printk(KERN_ERR PREFIX "Memory allocation error\n");
} }
kfree(buffer.pointer); kfree(buffer.pointer);
...@@ -1096,7 +1096,7 @@ static int acpi_device_set_context(struct acpi_device *device, int type) ...@@ -1096,7 +1096,7 @@ static int acpi_device_set_context(struct acpi_device *device, int type)
acpi_bus_data_handler, device); acpi_bus_data_handler, device);
if (ACPI_FAILURE(status)) { if (ACPI_FAILURE(status)) {
printk("Error attaching device data\n"); printk(KERN_ERR PREFIX "Error attaching device data\n");
result = -ENODEV; result = -ENODEV;
} }
} }
......
include/acpi/acmacros.h
View file @ a733a5da
...@@ -486,7 +486,7 @@ ...@@ -486,7 +486,7 @@
#define ACPI_FUNCTION_NAME(name) #define ACPI_FUNCTION_NAME(name)
#endif #endif
#ifdef DEBUG_FUNC_TRACE #ifdef CONFIG_ACPI_DEBUG_FUNC_TRACE
#define ACPI_FUNCTION_TRACE(a) ACPI_FUNCTION_NAME(a) \ #define ACPI_FUNCTION_TRACE(a) ACPI_FUNCTION_NAME(a) \
acpi_ut_trace(ACPI_DEBUG_PARAMETERS) acpi_ut_trace(ACPI_DEBUG_PARAMETERS)
...@@ -565,7 +565,7 @@ ...@@ -565,7 +565,7 @@
#endif /* ACPI_SIMPLE_RETURN_MACROS */ #endif /* ACPI_SIMPLE_RETURN_MACROS */
#else /* !DEBUG_FUNC_TRACE */ #else /* !CONFIG_ACPI_DEBUG_FUNC_TRACE */
#define ACPI_FUNCTION_TRACE(a) #define ACPI_FUNCTION_TRACE(a)
#define ACPI_FUNCTION_TRACE_PTR(a,b) #define ACPI_FUNCTION_TRACE_PTR(a,b)
...@@ -584,7 +584,7 @@ ...@@ -584,7 +584,7 @@
#define return_UINT32(s) return(s) #define return_UINT32(s) return(s)
#define return_PTR(s) return(s) #define return_PTR(s) return(s)
#endif /* DEBUG_FUNC_TRACE */ #endif /* CONFIG_ACPI_DEBUG_FUNC_TRACE */
/* Conditional execution */ /* Conditional execution */
......
include/acpi/acpi_drivers.h
View file @ a733a5da
...@@ -74,7 +74,6 @@ struct pci_bus; ...@@ -74,7 +74,6 @@ struct pci_bus;
acpi_status acpi_get_pci_id(acpi_handle handle, struct acpi_pci_id *id); acpi_status acpi_get_pci_id(acpi_handle handle, struct acpi_pci_id *id);
int acpi_pci_bind(struct acpi_device *device); int acpi_pci_bind(struct acpi_device *device);
int acpi_pci_unbind(struct acpi_device *device);
int acpi_pci_bind_root(struct acpi_device *device, struct acpi_pci_id *id, int acpi_pci_bind_root(struct acpi_device *device, struct acpi_pci_id *id,
struct pci_bus *bus); struct pci_bus *bus);
......
include/acpi/acpi_numa.h
View file @ a733a5da
...@@ -15,7 +15,6 @@ extern int pxm_to_node(int); ...@@ -15,7 +15,6 @@ extern int pxm_to_node(int);
extern int node_to_pxm(int); extern int node_to_pxm(int);
extern void __acpi_map_pxm_to_node(int, int); extern void __acpi_map_pxm_to_node(int, int);
extern int acpi_map_pxm_to_node(int); extern int acpi_map_pxm_to_node(int);
extern void __cpuinit acpi_unmap_pxm_to_node(int);
#endif /* CONFIG_ACPI_NUMA */ #endif /* CONFIG_ACPI_NUMA */
#endif /* __ACP_NUMA_H */ #endif /* __ACP_NUMA_H */
include/linux/acpi.h
View file @ a733a5da
...@@ -44,8 +44,6 @@ ...@@ -44,8 +44,6 @@
#include <linux/dmi.h> #include <linux/dmi.h>
#ifdef CONFIG_ACPI
enum acpi_irq_model_id { enum acpi_irq_model_id {
ACPI_IRQ_MODEL_PIC = 0, ACPI_IRQ_MODEL_PIC = 0,
ACPI_IRQ_MODEL_IOAPIC, ACPI_IRQ_MODEL_IOAPIC,
...@@ -116,9 +114,7 @@ int acpi_unmap_lsapic(int cpu); ...@@ -116,9 +114,7 @@ int acpi_unmap_lsapic(int cpu);
int acpi_register_ioapic(acpi_handle handle, u64 phys_addr, u32 gsi_base); int acpi_register_ioapic(acpi_handle handle, u64 phys_addr, u32 gsi_base);
int acpi_unregister_ioapic(acpi_handle handle, u32 gsi_base); int acpi_unregister_ioapic(acpi_handle handle, u32 gsi_base);
void acpi_irq_stats_init(void); void acpi_irq_stats_init(void);
extern u32 acpi_irq_handled; extern u32 acpi_irq_handled;
extern int acpi_mp_config;
extern struct acpi_mcfg_allocation *pci_mmcfg_config; extern struct acpi_mcfg_allocation *pci_mmcfg_config;
extern int pci_mmcfg_config_num; extern int pci_mmcfg_config_num;
...@@ -126,12 +122,6 @@ extern int pci_mmcfg_config_num; ...@@ -126,12 +122,6 @@ extern int pci_mmcfg_config_num;
extern int sbf_port; extern int sbf_port;
extern unsigned long acpi_realmode_flags; extern unsigned long acpi_realmode_flags;
#else /* !CONFIG_ACPI */
#define acpi_mp_config 0
#endif /* !CONFIG_ACPI */
int acpi_register_gsi (u32 gsi, int triggering, int polarity); int acpi_register_gsi (u32 gsi, int triggering, int polarity);
int acpi_gsi_to_irq (u32 gsi, unsigned int *irq); int acpi_gsi_to_irq (u32 gsi, unsigned int *irq);
...@@ -147,8 +137,6 @@ extern int acpi_get_override_irq(int bus_irq, int *trigger, int *polarity); ...@@ -147,8 +137,6 @@ extern int acpi_get_override_irq(int bus_irq, int *trigger, int *polarity);
*/ */
void acpi_unregister_gsi (u32 gsi); void acpi_unregister_gsi (u32 gsi);
#ifdef CONFIG_ACPI
struct acpi_prt_entry { struct acpi_prt_entry {
struct list_head node; struct list_head node;
struct acpi_pci_id id; struct acpi_pci_id id;
...@@ -181,8 +169,6 @@ struct acpi_pci_driver { ...@@ -181,8 +169,6 @@ struct acpi_pci_driver {
int acpi_pci_register_driver(struct acpi_pci_driver *driver); int acpi_pci_register_driver(struct acpi_pci_driver *driver);
void acpi_pci_unregister_driver(struct acpi_pci_driver *driver); void acpi_pci_unregister_driver(struct acpi_pci_driver *driver);
#endif /* CONFIG_ACPI */
#ifdef CONFIG_ACPI_EC #ifdef CONFIG_ACPI_EC
extern int ec_read(u8 addr, u8 *val); extern int ec_read(u8 addr, u8 *val);
......
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