Commit 85eb278c authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Juergen Gross
Browse files

xen/ACPI: Switch to bitmap_zalloc() 



Switch to bitmap_zalloc() to show clearly what we are allocating.
Besides that it returns pointer of bitmap type instead of opaque void *.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarJuergen Gross <jgross@suse.com>
Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
parent 1d988ed4

drivers/xen/xen-acpi-processor.c

+11 −11
Original line number Diff line number Diff line
@@ -410,21 +410,21 @@ static int check_acpi_ids(struct acpi_processor *pr_backup) 
	/* All online CPUs have been processed at this stage. Now verify

	 * whether in fact "online CPUs" == physical CPUs.

	 */

	acpi_id_present = kcalloc(BITS_TO_LONGS(nr_acpi_bits), sizeof(unsigned long), GFP_KERNEL);

	acpi_id_present = bitmap_zalloc(nr_acpi_bits, GFP_KERNEL);

	if (!acpi_id_present)

		return -ENOMEM;



	acpi_id_cst_present = kcalloc(BITS_TO_LONGS(nr_acpi_bits), sizeof(unsigned long), GFP_KERNEL);

	acpi_id_cst_present = bitmap_zalloc(nr_acpi_bits, GFP_KERNEL);

	if (!acpi_id_cst_present) {

		kfree(acpi_id_present);

		bitmap_free(acpi_id_present);

		return -ENOMEM;

	}



	acpi_psd = kcalloc(nr_acpi_bits, sizeof(struct acpi_psd_package),

			   GFP_KERNEL);

	if (!acpi_psd) {

		kfree(acpi_id_present);

		kfree(acpi_id_cst_present);

		bitmap_free(acpi_id_present);

		bitmap_free(acpi_id_cst_present);

		return -ENOMEM;

	}
@@ -533,14 +533,14 @@ static int __init xen_acpi_processor_init(void) 
		return -ENODEV;



	nr_acpi_bits = get_max_acpi_id() + 1;

	acpi_ids_done = kcalloc(BITS_TO_LONGS(nr_acpi_bits), sizeof(unsigned long), GFP_KERNEL);

	acpi_ids_done = bitmap_zalloc(nr_acpi_bits, GFP_KERNEL);

	if (!acpi_ids_done)

		return -ENOMEM;



	acpi_perf_data = alloc_percpu(struct acpi_processor_performance);

	if (!acpi_perf_data) {

		pr_debug("Memory allocation error for acpi_perf_data\n");

		kfree(acpi_ids_done);

		bitmap_free(acpi_ids_done);

		return -ENOMEM;

	}

	for_each_possible_cpu(i) {
@@ -584,7 +584,7 @@ err_unregister: 
err_out:

	/* Freeing a NULL pointer is OK: alloc_percpu zeroes. */

	free_acpi_perf_data();

	kfree(acpi_ids_done);

	bitmap_free(acpi_ids_done);

	return rc;

}

static void __exit xen_acpi_processor_exit(void)
@@ -592,9 +592,9 @@ static void __exit xen_acpi_processor_exit(void) 
	int i;



	unregister_syscore_ops(&xap_syscore_ops);

	kfree(acpi_ids_done);

	kfree(acpi_id_present);

	kfree(acpi_id_cst_present);

	bitmap_free(acpi_ids_done);

	bitmap_free(acpi_id_present);

	bitmap_free(acpi_id_cst_present);

	kfree(acpi_psd);

	for_each_possible_cpu(i)

		acpi_processor_unregister_performance(i);

CRA Git | Maintained and supported by SUSTech CRA and CCSE