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

Commit 8466361a authored by Len Brown's avatar Len Brown
Browse files

[ACPI] delete CONFIG_ACPI_INTERPRETER 



it is a synonym for CONFIG_ACPI

Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 888ba6c6

arch/i386/defconfig

+0 −1
Original line number Original line Diff line number Diff line
@@ -131,7 +131,6 @@ CONFIG_SOFTWARE_SUSPEND=y 
# ACPI (Advanced Configuration and Power Interface) Support

# ACPI (Advanced Configuration and Power Interface) Support

#

#

CONFIG_ACPI=y

CONFIG_ACPI=y

CONFIG_ACPI_INTERPRETER=y

CONFIG_ACPI_SLEEP=y

CONFIG_ACPI_SLEEP=y

CONFIG_ACPI_SLEEP_PROC_FS=y

CONFIG_ACPI_SLEEP_PROC_FS=y

CONFIG_ACPI_AC=y

CONFIG_ACPI_AC=y

arch/i386/kernel/acpi/boot.c

+3 −5
Original line number Original line Diff line number Diff line
@@ -303,7 +303,7 @@ acpi_parse_lapic_nmi(acpi_table_entry_header * header, const unsigned long end) 




#endif				/*CONFIG_X86_LOCAL_APIC */

#endif				/*CONFIG_X86_LOCAL_APIC */





#if defined(CONFIG_X86_IO_APIC) && defined(CONFIG_ACPI_INTERPRETER)

#ifdef CONFIG_X86_IO_APIC





static int __init

static int __init

acpi_parse_ioapic(acpi_table_entry_header * header, const unsigned long end)

acpi_parse_ioapic(acpi_table_entry_header * header, const unsigned long end)
@@ -634,10 +634,8 @@ static int __init acpi_parse_fadt(unsigned long phys, unsigned long size) 
		printk(KERN_WARNING PREFIX "Unable to map FADT\n");

		printk(KERN_WARNING PREFIX "Unable to map FADT\n");

		return 0;

		return 0;

	}

	}

#ifdef	CONFIG_ACPI_INTERPRETER

	/* initialize sci_int early for INT_SRC_OVR MADT parsing */

	/* initialize sci_int early for INT_SRC_OVR MADT parsing */

	acpi_fadt.sci_int = fadt->sci_int;

	acpi_fadt.sci_int = fadt->sci_int;

#endif





#ifdef CONFIG_ACPI_BUS

#ifdef CONFIG_ACPI_BUS

	/* initialize rev and apic_phys_dest_mode for x86_64 genapic */

	/* initialize rev and apic_phys_dest_mode for x86_64 genapic */
@@ -735,7 +733,7 @@ static int __init acpi_parse_madt_lapic_entries(void) 
}

}

#endif				/* CONFIG_X86_LOCAL_APIC */

#endif				/* CONFIG_X86_LOCAL_APIC */





#if defined(CONFIG_X86_IO_APIC) && defined(CONFIG_ACPI_INTERPRETER)

#ifdef	CONFIG_X86_IO_APIC

/*

/*

 * Parse IOAPIC related entries in MADT

 * Parse IOAPIC related entries in MADT

 * returns 0 on success, < 0 on error

 * returns 0 on success, < 0 on error
@@ -810,7 +808,7 @@ static inline int acpi_parse_madt_ioapic_entries(void) 
{

{

	return -1;

	return -1;

}

}

#endif				/* !(CONFIG_X86_IO_APIC && CONFIG_ACPI_INTERPRETER) */

#endif	/* !CONFIG_X86_IO_APIC */





static void __init acpi_process_madt(void)

static void __init acpi_process_madt(void)

{

{

arch/i386/kernel/mpparse.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -854,7 +854,7 @@ void __init mp_register_lapic ( 
	MP_processor_info(&processor);

	MP_processor_info(&processor);

}

}





#if defined(CONFIG_X86_IO_APIC) && defined(CONFIG_ACPI_INTERPRETER)

#ifdef	CONFIG_X86_IO_APIC





#define MP_ISA_BUS		0

#define MP_ISA_BUS		0

#define MP_MAX_IOAPIC_PIN	127

#define MP_MAX_IOAPIC_PIN	127
@@ -1136,5 +1136,5 @@ int mp_register_gsi (u32 gsi, int edge_level, int active_high_low) 
	return gsi;

	return gsi;

}

}





#endif /* CONFIG_X86_IO_APIC && CONFIG_ACPI_INTERPRETER */

#endif /* CONFIG_X86_IO_APIC */

#endif /* CONFIG_ACPI */
 
#endif /* CONFIG_ACPI */

arch/i386/kernel/setup.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -87,7 +87,7 @@ EXPORT_SYMBOL(boot_cpu_data); 




unsigned long mmu_cr4_features;

unsigned long mmu_cr4_features;





#ifdef	CONFIG_ACPI_INTERPRETER

#ifdef	CONFIG_ACPI

	int acpi_disabled = 0;

	int acpi_disabled = 0;

#else

#else

	int acpi_disabled = 1;

	int acpi_disabled = 1;

arch/i386/mach-es7000/es7000plat.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -51,7 +51,7 @@ struct mip_reg *host_reg; 
int 			mip_port;

int 			mip_port;

unsigned long		mip_addr, host_addr;

unsigned long		mip_addr, host_addr;





#if defined(CONFIG_X86_IO_APIC) && defined(CONFIG_ACPI_INTERPRETER)

#if defined(CONFIG_X86_IO_APIC) && defined(CONFIG_ACPI)





/*

/*

 * GSI override for ES7000 platforms.

 * GSI override for ES7000 platforms.
@@ -73,7 +73,7 @@ es7000_rename_gsi(int ioapic, int gsi) 
	return gsi;

	return gsi;

}

}





#endif // (CONFIG_X86_IO_APIC) && (CONFIG_ACPI_INTERPRETER)

#endif	/* (CONFIG_X86_IO_APIC) && (CONFIG_ACPI) */





/*

/*

 * Parse the OEM Table

 * Parse the OEM Table