Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b79b27d authored by Len Brown's avatar Len Brown
Browse files

Merge branch 'yinghai' into test

parents 7674416d fa89b608

arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -779,6 +779,9 @@ static int __init acpi_cpufreq_init(void) 
{

{

	int ret;

	int ret;





	if (acpi_disabled)

		return 0;



	dprintk("acpi_cpufreq_init\n");

	dprintk("acpi_cpufreq_init\n");





	ret = acpi_cpufreq_early_init();

	ret = acpi_cpufreq_early_init();

include/linux/acpi.h

+0 −8
Original line number Original line Diff line number Diff line
@@ -94,18 +94,10 @@ int acpi_parse_mcfg (struct acpi_table_header *header); 
void acpi_table_print_madt_entry (struct acpi_subtable_header *madt);

void acpi_table_print_madt_entry (struct acpi_subtable_header *madt);





/* the following four functions are architecture-dependent */

/* the following four functions are architecture-dependent */

#ifdef CONFIG_HAVE_ARCH_PARSE_SRAT

#define NR_NODE_MEMBLKS MAX_NUMNODES

#define acpi_numa_slit_init(slit) do {} while (0)

#define acpi_numa_processor_affinity_init(pa) do {} while (0)

#define acpi_numa_memory_affinity_init(ma) do {} while (0)

#define acpi_numa_arch_fixup() do {} while (0)

#else

void acpi_numa_slit_init (struct acpi_table_slit *slit);

void acpi_numa_slit_init (struct acpi_table_slit *slit);

void acpi_numa_processor_affinity_init (struct acpi_srat_cpu_affinity *pa);

void acpi_numa_processor_affinity_init (struct acpi_srat_cpu_affinity *pa);

void acpi_numa_memory_affinity_init (struct acpi_srat_mem_affinity *ma);

void acpi_numa_memory_affinity_init (struct acpi_srat_mem_affinity *ma);

void acpi_numa_arch_fixup(void);

void acpi_numa_arch_fixup(void);

#endif





#ifdef CONFIG_ACPI_HOTPLUG_CPU

#ifdef CONFIG_ACPI_HOTPLUG_CPU

/* Arch dependent functions for cpu hotplug support */

/* Arch dependent functions for cpu hotplug support */