ia64/xen-unstable

changeset 8432:934470721c46

Remove acpi_count_madt functions. Only appear to be used
for diagnostic tracing in xen/ia64.

Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@firebug.cl.cam.ac.uk
date Wed Dec 21 20:18:19 2005 +0100 (2005-12-21)
parents 8b322047c80f
children f218e6ba2653 6375713d0e41 8d5d4d58407f
files xen/arch/ia64/xen/acpi.c xen/drivers/acpi/tables.c xen/include/xen/acpi.h
line diff
     1.1 --- a/xen/arch/ia64/xen/acpi.c	Wed Dec 21 20:17:22 2005 +0100
     1.2 +++ b/xen/arch/ia64/xen/acpi.c	Wed Dec 21 20:18:19 2005 +0100
     1.3 @@ -604,17 +604,8 @@ acpi_boot_init (void)
     1.4  	if (acpi_table_parse_madt(ACPI_MADT_LAPIC_ADDR_OVR, acpi_parse_lapic_addr_ovr, 0) < 0)
     1.5  		printk(KERN_ERR PREFIX "Error parsing LAPIC address override entry\n");
     1.6  
     1.7 -#ifdef CONFIG_SMP
     1.8 -	int count;
     1.9 -	if ((count = acpi_table_count_madt(ACPI_MADT_LSAPIC)) < 1) {
    1.10 -		printk(KERN_ERR PREFIX "Error parsing MADT - no LSAPIC entries\n");
    1.11 -	} else {
    1.12 -		acpi_table_parse_madt(ACPI_MADT_LSAPIC, acpi_parse_lsapic, count);
    1.13 -	}
    1.14 -#else
    1.15  	if (acpi_table_parse_madt(ACPI_MADT_LSAPIC, acpi_parse_lsapic, NR_CPUS) < 1)
    1.16  		printk(KERN_ERR PREFIX "Error parsing MADT - no LSAPIC entries\n");
    1.17 -#endif
    1.18  
    1.19  	if (acpi_table_parse_madt(ACPI_MADT_LAPIC_NMI, acpi_parse_lapic_nmi, 0) < 0)
    1.20  		printk(KERN_ERR PREFIX "Error parsing LAPIC NMI entry\n");
     2.1 --- a/xen/drivers/acpi/tables.c	Wed Dec 21 20:17:22 2005 +0100
     2.2 +++ b/xen/drivers/acpi/tables.c	Wed Dec 21 20:18:19 2005 +0100
     2.3 @@ -607,60 +607,3 @@ acpi_table_init (void)
     2.4  
     2.5  	return 0;
     2.6  }
     2.7 -
     2.8 -int __init
     2.9 -acpi_table_count_madt_family (
    2.10 -	enum acpi_table_id	id,
    2.11 -	unsigned long		madt_size,
    2.12 -	int			entry_id)
    2.13 -{
    2.14 -	void			*madt = NULL;
    2.15 -	acpi_table_entry_header	*entry;
    2.16 -	unsigned int		count = 0;
    2.17 -	unsigned long		madt_end;
    2.18 -	unsigned int		i;
    2.19 -
    2.20 -	/* Locate the MADT (if exists). There should only be one. */
    2.21 -
    2.22 -	for (i = 0; i < sdt_count; i++) {
    2.23 -		if (sdt_entry[i].id != id)
    2.24 -			continue;
    2.25 -		madt = (void *)
    2.26 -			__acpi_map_table(sdt_entry[i].pa, sdt_entry[i].size);
    2.27 -		if (!madt) {
    2.28 -			printk(KERN_WARNING PREFIX "Unable to map %s\n",
    2.29 -				acpi_table_signatures[id]);
    2.30 -			return -ENODEV;
    2.31 -		}
    2.32 -		break;
    2.33 -	}
    2.34 -
    2.35 -	if (!madt) {
    2.36 -		printk(KERN_WARNING PREFIX "%s not present\n",
    2.37 -			acpi_table_signatures[id]);
    2.38 -		return -ENODEV;
    2.39 -	}
    2.40 -
    2.41 -	madt_end = (unsigned long) madt + sdt_entry[i].size;
    2.42 -
    2.43 -	/* Parse all entries looking for a match. */
    2.44 -
    2.45 -	entry = (acpi_table_entry_header *)
    2.46 -		((unsigned long) madt + madt_size);
    2.47 -
    2.48 -	while (((unsigned long) entry) + sizeof(acpi_table_entry_header) < madt_end) {
    2.49 -		if (entry->type == entry_id) count++;
    2.50 -
    2.51 -		entry = (acpi_table_entry_header *)
    2.52 -			((unsigned long) entry + entry->length);
    2.53 -	}
    2.54 -
    2.55 -	return count;
    2.56 -}
    2.57 -
    2.58 -
    2.59 -int __init
    2.60 -acpi_table_count_madt (enum acpi_madt_entry_id id)
    2.61 -{
    2.62 -	return acpi_table_count_madt_family(ACPI_APIC, sizeof(struct acpi_table_madt), id);
    2.63 -}
     3.1 --- a/xen/include/xen/acpi.h	Wed Dec 21 20:17:22 2005 +0100
     3.2 +++ b/xen/include/xen/acpi.h	Wed Dec 21 20:18:19 2005 +0100
     3.3 @@ -390,7 +390,6 @@ int acpi_table_parse_srat (enum acpi_sra
     3.4  void acpi_table_print (struct acpi_table_header *header, unsigned long phys_addr);
     3.5  void acpi_table_print_madt_entry (acpi_table_entry_header *madt);
     3.6  void acpi_table_print_srat_entry (acpi_table_entry_header *srat);
     3.7 -int acpi_table_count_madt (enum acpi_madt_entry_id id);
     3.8  
     3.9  /* the following four functions are architecture-dependent */
    3.10  void acpi_numa_slit_init (struct acpi_table_slit *slit);