leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pull trivial2 into release branch

Browse Source
This commit is contained in:
Len Brown 2006-06-15 21:31:17 -04:00
commit bf891bd65d
6 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,8 +68,6 @@ EXPORT_SYMBOL(pm_power_off);
unsigned char acpi_kbd_controller_present = 1; unsigned char acpi_kbd_controller_present = 1;
unsigned char acpi_legacy_devices; unsigned char acpi_legacy_devices;
static unsigned int __initdata acpi_madt_rev;
unsigned int acpi_cpei_override; unsigned int acpi_cpei_override;
unsigned int acpi_cpei_phys_cpuid; unsigned int acpi_cpei_phys_cpuid;
@ -243,6 +241,8 @@ acpi_parse_iosapic(acpi_table_entry_header * header, const unsigned long end)
return iosapic_init(iosapic->address, iosapic->global_irq_base); return iosapic_init(iosapic->address, iosapic->global_irq_base);
} }
static unsigned int __initdata acpi_madt_rev;
static int __init static int __init
acpi_parse_plat_int_src(acpi_table_entry_header * header, acpi_parse_plat_int_src(acpi_table_entry_header * header,
const unsigned long end) const unsigned long end)

2
arch/ia64/mm/init.c
View File

@ -671,9 +671,11 @@ int add_memory(u64 start, u64 size)
return ret; return ret;
} }
EXPORT_SYMBOL_GPL(add_memory);
int remove_memory(u64 start, u64 size) int remove_memory(u64 start, u64 size)
{ {
return -EINVAL; return -EINVAL;
} }
EXPORT_SYMBOL_GPL(remove_memory);
#endif #endif

2
drivers/acpi/asus_acpi.c
View File

@ -1245,7 +1245,7 @@ static int __init asus_acpi_init(void)
if (!asus_hotk_found) { if (!asus_hotk_found) {
acpi_bus_unregister_driver(&asus_hotk_driver); acpi_bus_unregister_driver(&asus_hotk_driver);
remove_proc_entry(PROC_ASUS, acpi_root_dir); remove_proc_entry(PROC_ASUS, acpi_root_dir);
return -ENODEV; return result;
} }
return 0; return 0;

8
drivers/acpi/processor_idle.c
View File

@ -54,10 +54,10 @@ ACPI_MODULE_NAME("acpi_processor")
#define US_TO_PM_TIMER_TICKS(t) ((t * (PM_TIMER_FREQUENCY/1000)) / 1000) #define US_TO_PM_TIMER_TICKS(t) ((t * (PM_TIMER_FREQUENCY/1000)) / 1000)
#define C2_OVERHEAD 4 /* 1us (3.579 ticks per us) */ #define C2_OVERHEAD 4 /* 1us (3.579 ticks per us) */
#define C3_OVERHEAD 4 /* 1us (3.579 ticks per us) */ #define C3_OVERHEAD 4 /* 1us (3.579 ticks per us) */
static void (*pm_idle_save) (void); static void (*pm_idle_save) (void) __read_mostly;
module_param(max_cstate, uint, 0644); module_param(max_cstate, uint, 0644);
static unsigned int nocst = 0; static unsigned int nocst __read_mostly;
module_param(nocst, uint, 0000); module_param(nocst, uint, 0000);
/* /*
@ -67,7 +67,7 @@ module_param(nocst, uint, 0000);
* 100 HZ: 0x0000000F: 4 jiffies = 40ms * 100 HZ: 0x0000000F: 4 jiffies = 40ms
* reduce history for more aggressive entry into C3 * reduce history for more aggressive entry into C3
*/ */
static unsigned int bm_history = static unsigned int bm_history __read_mostly =
(HZ >= 800 ? 0xFFFFFFFF : ((1U << (HZ / 25)) - 1)); (HZ >= 800 ? 0xFFFFFFFF : ((1U << (HZ / 25)) - 1));
module_param(bm_history, uint, 0644); module_param(bm_history, uint, 0644);
/* -------------------------------------------------------------------------- /* --------------------------------------------------------------------------
@ -1081,7 +1081,7 @@ int acpi_processor_power_init(struct acpi_processor *pr,
struct acpi_device *device) struct acpi_device *device)
{ {
acpi_status status = 0; acpi_status status = 0;
static int first_run = 0; static int first_run;
struct proc_dir_entry *entry = NULL; struct proc_dir_entry *entry = NULL;
unsigned int i; unsigned int i;

2
drivers/acpi/thermal.c
View File

@ -1343,7 +1343,7 @@ static int acpi_thermal_add(struct acpi_device *device)
result = acpi_thermal_add_fs(device); result = acpi_thermal_add_fs(device);
if (result) if (result)
return_VALUE(result); goto end;
init_timer(&tz->timer); init_timer(&tz->timer);

2
drivers/acpi/utils.c
View File

@ -273,11 +273,13 @@ acpi_evaluate_integer(acpi_handle handle,
status = acpi_evaluate_object(handle, pathname, arguments, &buffer); status = acpi_evaluate_object(handle, pathname, arguments, &buffer);
if (ACPI_FAILURE(status)) { if (ACPI_FAILURE(status)) {
acpi_util_eval_error(handle, pathname, status); acpi_util_eval_error(handle, pathname, status);
kfree(element);
return_ACPI_STATUS(status); return_ACPI_STATUS(status);
} }
if (element->type != ACPI_TYPE_INTEGER) { if (element->type != ACPI_TYPE_INTEGER) {
acpi_util_eval_error(handle, pathname, AE_BAD_DATA); acpi_util_eval_error(handle, pathname, AE_BAD_DATA);
kfree(element);
return_ACPI_STATUS(AE_BAD_DATA); return_ACPI_STATUS(AE_BAD_DATA);
} }