lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'misc' into release

Browse Source
This commit is contained in:
Len Brown
2011-03-23 02:19:58 -04:00
parent 3c7ef2138a cdf2a4eede
commit 8a9026d2e9
4 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
arch/ia64/kernel/acpi.c
View File

@@ -803,7 +803,7 @@ int acpi_isa_irq_to_gsi(unsigned isa_irq, u32 *gsi)
* ACPI based hotplug CPU support * ACPI based hotplug CPU support
*/ */
#ifdef CONFIG_ACPI_HOTPLUG_CPU #ifdef CONFIG_ACPI_HOTPLUG_CPU
static static __cpuinit
int acpi_map_cpu2node(acpi_handle handle, int cpu, int physid) int acpi_map_cpu2node(acpi_handle handle, int cpu, int physid)
{ {
#ifdef CONFIG_ACPI_NUMA #ifdef CONFIG_ACPI_NUMA
@@ -878,7 +878,7 @@ __init void prefill_possible_map(void)
set_cpu_possible(i, true); set_cpu_possible(i, true);
} }
int acpi_map_lsapic(acpi_handle handle, int *pcpu) static int __cpuinit _acpi_map_lsapic(acpi_handle handle, int *pcpu)
{ {
struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
union acpi_object *obj; union acpi_object *obj;
@@ -929,6 +929,11 @@ int acpi_map_lsapic(acpi_handle handle, int *pcpu)
return (0); return (0);
} }
/* wrapper to silence section mismatch warning */
int __ref acpi_map_lsapic(acpi_handle handle, int *pcpu)
{
return _acpi_map_lsapic(handle, pcpu);
}
EXPORT_SYMBOL(acpi_map_lsapic); EXPORT_SYMBOL(acpi_map_lsapic);
int acpi_unmap_lsapic(int cpu) int acpi_unmap_lsapic(int cpu)

11
drivers/acpi/acpi_pad.c
View File

@@ -298,7 +298,7 @@ static ssize_t acpi_pad_rrtime_store(struct device *dev,
static ssize_t acpi_pad_rrtime_show(struct device *dev, static ssize_t acpi_pad_rrtime_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
return scnprintf(buf, PAGE_SIZE, "%d", round_robin_time); return scnprintf(buf, PAGE_SIZE, "%d\n", round_robin_time);
} }
static DEVICE_ATTR(rrtime, S_IRUGO|S_IWUSR, static DEVICE_ATTR(rrtime, S_IRUGO|S_IWUSR,
acpi_pad_rrtime_show, acpi_pad_rrtime_show,
@@ -321,7 +321,7 @@ static ssize_t acpi_pad_idlepct_store(struct device *dev,
static ssize_t acpi_pad_idlepct_show(struct device *dev, static ssize_t acpi_pad_idlepct_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
return scnprintf(buf, PAGE_SIZE, "%d", idle_pct); return scnprintf(buf, PAGE_SIZE, "%d\n", idle_pct);
} }
static DEVICE_ATTR(idlepct, S_IRUGO|S_IWUSR, static DEVICE_ATTR(idlepct, S_IRUGO|S_IWUSR,
acpi_pad_idlepct_show, acpi_pad_idlepct_show,
@@ -342,8 +342,11 @@ static ssize_t acpi_pad_idlecpus_store(struct device *dev,
static ssize_t acpi_pad_idlecpus_show(struct device *dev, static ssize_t acpi_pad_idlecpus_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
return cpumask_scnprintf(buf, PAGE_SIZE, int n = 0;
to_cpumask(pad_busy_cpus_bits)); n = cpumask_scnprintf(buf, PAGE_SIZE-2, to_cpumask(pad_busy_cpus_bits));
buf[n++] = '\n';
buf[n] = '\0';
return n;
} }
static DEVICE_ATTR(idlecpus, S_IRUGO|S_IWUSR, static DEVICE_ATTR(idlecpus, S_IRUGO|S_IWUSR,
acpi_pad_idlecpus_show, acpi_pad_idlecpus_show,

17
drivers/acpi/processor_core.c
View File

@@ -19,7 +19,7 @@
#define _COMPONENT ACPI_PROCESSOR_COMPONENT #define _COMPONENT ACPI_PROCESSOR_COMPONENT
ACPI_MODULE_NAME("processor_core"); ACPI_MODULE_NAME("processor_core");
static int set_no_mwait(const struct dmi_system_id *id) static int __init set_no_mwait(const struct dmi_system_id *id)
{ {
printk(KERN_NOTICE PREFIX "%s detected - " printk(KERN_NOTICE PREFIX "%s detected - "
"disabling mwait for CPU C-states\n", id->ident); "disabling mwait for CPU C-states\n", id->ident);
@@ -27,7 +27,7 @@ static int set_no_mwait(const struct dmi_system_id *id)
return 0; return 0;
} }
static struct dmi_system_id __cpuinitdata processor_idle_dmi_table[] = { static struct dmi_system_id __initdata processor_idle_dmi_table[] = {
{ {
set_no_mwait, "Extensa 5220", { set_no_mwait, "Extensa 5220", {
DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies LTD"), DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies LTD"),
@@ -183,7 +183,7 @@ int acpi_get_cpuid(acpi_handle handle, int type, u32 acpi_id)
EXPORT_SYMBOL_GPL(acpi_get_cpuid); EXPORT_SYMBOL_GPL(acpi_get_cpuid);
#endif #endif
static bool processor_physically_present(acpi_handle handle) static bool __init processor_physically_present(acpi_handle handle)
{ {
int cpuid, type; int cpuid, type;
u32 acpi_id; u32 acpi_id;
@@ -223,7 +223,7 @@ static bool processor_physically_present(acpi_handle handle)
return true; return true;
} }
static void acpi_set_pdc_bits(u32 *buf) static void __cpuinit acpi_set_pdc_bits(u32 *buf)
{ {
buf[0] = ACPI_PDC_REVISION_ID; buf[0] = ACPI_PDC_REVISION_ID;
buf[1] = 1; buf[1] = 1;
@@ -235,7 +235,7 @@ static void acpi_set_pdc_bits(u32 *buf)
arch_acpi_set_pdc_bits(buf); arch_acpi_set_pdc_bits(buf);
} }
static struct acpi_object_list *acpi_processor_alloc_pdc(void) static struct acpi_object_list *__cpuinit acpi_processor_alloc_pdc(void)
{ {
struct acpi_object_list *obj_list; struct acpi_object_list *obj_list;
union acpi_object *obj; union acpi_object *obj;
@@ -278,7 +278,7 @@ static struct acpi_object_list *acpi_processor_alloc_pdc(void)
* _PDC is required for a BIOS-OS handshake for most of the newer * _PDC is required for a BIOS-OS handshake for most of the newer
* ACPI processor features. * ACPI processor features.
*/ */
static int static int __cpuinit
acpi_processor_eval_pdc(acpi_handle handle, struct acpi_object_list *pdc_in) acpi_processor_eval_pdc(acpi_handle handle, struct acpi_object_list *pdc_in)
{ {
acpi_status status = AE_OK; acpi_status status = AE_OK;
@@ -306,7 +306,7 @@ acpi_processor_eval_pdc(acpi_handle handle, struct acpi_object_list *pdc_in)
return status; return status;
} }
void acpi_processor_set_pdc(acpi_handle handle) void __cpuinit acpi_processor_set_pdc(acpi_handle handle)
{ {
struct acpi_object_list *obj_list; struct acpi_object_list *obj_list;
@@ -323,9 +323,8 @@ void acpi_processor_set_pdc(acpi_handle handle)
kfree(obj_list->pointer); kfree(obj_list->pointer);
kfree(obj_list); kfree(obj_list);
} }
EXPORT_SYMBOL_GPL(acpi_processor_set_pdc);
static acpi_status static acpi_status __init
early_init_pdc(acpi_handle handle, u32 lvl, void *context, void **rv) early_init_pdc(acpi_handle handle, u32 lvl, void *context, void **rv)
{ {
if (processor_physically_present(handle) == false) if (processor_physically_present(handle) == false)

2
drivers/acpi/processor_driver.c
View File

@@ -635,7 +635,7 @@ int acpi_processor_device_add(acpi_handle handle, struct acpi_device **device)
return 0; return 0;
} }
static void __ref acpi_processor_hotplug_notify(acpi_handle handle, static void acpi_processor_hotplug_notify(acpi_handle handle,
u32 event, void *data) u32 event, void *data)
{ {
struct acpi_processor *pr; struct acpi_processor *pr;