aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64/kernel/acpi-processor.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/ia64/kernel/acpi-processor.c')
-rw-r--r--arch/ia64/kernel/acpi-processor.c34
1 files changed, 1 insertions, 33 deletions
diff --git a/arch/ia64/kernel/acpi-processor.c b/arch/ia64/kernel/acpi-processor.c
index dbda7bde611..ab72d46f52c 100644
--- a/arch/ia64/kernel/acpi-processor.c
+++ b/arch/ia64/kernel/acpi-processor.c
@@ -16,31 +16,7 @@
16 16
17static void init_intel_pdc(struct acpi_processor *pr) 17static void init_intel_pdc(struct acpi_processor *pr)
18{ 18{
19 struct acpi_object_list *obj_list; 19 u32 *buf = (u32 *)pr->pdc->pointer->buffer.pointer;
20 union acpi_object *obj;
21 u32 *buf;
22
23 /* allocate and initialize pdc. It will be used later. */
24 obj_list = kmalloc(sizeof(struct acpi_object_list), GFP_KERNEL);
25 if (!obj_list) {
26 printk(KERN_ERR "Memory allocation error\n");
27 return;
28 }
29
30 obj = kmalloc(sizeof(union acpi_object), GFP_KERNEL);
31 if (!obj) {
32 printk(KERN_ERR "Memory allocation error\n");
33 kfree(obj_list);
34 return;
35 }
36
37 buf = kmalloc(12, GFP_KERNEL);
38 if (!buf) {
39 printk(KERN_ERR "Memory allocation error\n");
40 kfree(obj);
41 kfree(obj_list);
42 return;
43 }
44 20
45 buf[0] = ACPI_PDC_REVISION_ID; 21 buf[0] = ACPI_PDC_REVISION_ID;
46 buf[1] = 1; 22 buf[1] = 1;
@@ -52,20 +28,12 @@ static void init_intel_pdc(struct acpi_processor *pr)
52 */ 28 */
53 buf[2] |= ACPI_PDC_SMP_T_SWCOORD; 29 buf[2] |= ACPI_PDC_SMP_T_SWCOORD;
54 30
55 obj->type = ACPI_TYPE_BUFFER;
56 obj->buffer.length = 12;
57 obj->buffer.pointer = (u8 *) buf;
58 obj_list->count = 1;
59 obj_list->pointer = obj;
60 pr->pdc = obj_list;
61
62 return; 31 return;
63} 32}
64 33
65/* Initialize _PDC data based on the CPU vendor */ 34/* Initialize _PDC data based on the CPU vendor */
66void arch_acpi_processor_init_pdc(struct acpi_processor *pr) 35void arch_acpi_processor_init_pdc(struct acpi_processor *pr)
67{ 36{
68 pr->pdc = NULL;
69 init_intel_pdc(pr); 37 init_intel_pdc(pr);
70 return; 38 return;
71} 39}