Commit 2e0f2b16 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Tony Luck
Browse files

ia64: remove CONFIG_ACPI ifdefs 



Now that hpsim support is gone, CONFIG_ACPI is forced on for ia64, and
we can remove a few ifdefs for it.

Acked-by: default avatarTom Vaden <tom.vaden@hpe.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lkml.kernel.org/r/20190813072514.23299-20-hch@lst.de


Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 768557ca

arch/ia64/include/asm/acpi.h

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include <linux/numa.h>

#include <asm/numa.h>



#ifdef	CONFIG_ACPI



extern int acpi_lapic;

#define acpi_disabled 0	/* ACPI always enabled on IA64 */

#define acpi_noirq 0	/* ACPI always enabled on IA64 */
@@ -28,7 +28,7 @@ static inline bool acpi_has_cpu_in_madt(void) 
{

	return !!acpi_lapic;

}

#endif



#define acpi_processor_cstate_check(x) (x) /* no idle limits on IA64 :) */

static inline void disable_acpi(void) { }

arch/ia64/kernel/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -12,9 +12,9 @@ extra-y := head.o vmlinux.lds 
obj-y := entry.o efi.o efi_stub.o gate-data.o fsys.o ia64_ksyms.o irq.o irq_ia64.o	\

	 irq_lsapic.o ivt.o machvec.o pal.o patch.o process.o perfmon.o ptrace.o sal.o		\

	 salinfo.o setup.o signal.o sys_ia64.o time.o traps.o unaligned.o \

	 unwind.o mca.o mca_asm.o topology.o dma-mapping.o iosapic.o

	 unwind.o mca.o mca_asm.o topology.o dma-mapping.o iosapic.o acpi.o \

	 acpi-ext.o



obj-$(CONFIG_ACPI)		+= acpi.o acpi-ext.o

obj-$(CONFIG_IA64_BRL_EMU)	+= brl_emu.o



obj-$(CONFIG_IA64_PALINFO)	+= palinfo.o

arch/ia64/kernel/iosapic.c

+0 −2
Original line number Diff line number Diff line
@@ -643,10 +643,8 @@ get_target_cpu (unsigned int gsi, int irq) 
	if (!cpu_online(smp_processor_id()))

		return cpu_physical_id(smp_processor_id());



#ifdef CONFIG_ACPI

	if (cpe_vector > 0 && irq_to_vector(irq) == IA64_CPEP_VECTOR)

		return get_cpei_target_cpu();

#endif



#ifdef CONFIG_NUMA

	{

arch/ia64/kernel/irq_ia64.c

+0 −2
Original line number Diff line number Diff line
@@ -633,9 +633,7 @@ ia64_native_register_ipi(void) 
void __init

init_IRQ (void)

{

#ifdef CONFIG_ACPI

	acpi_boot_init();

#endif

	ia64_register_ipi();

	register_percpu_irq(IA64_SPURIOUS_INT_VECTOR, NULL);

#ifdef CONFIG_SMP

arch/ia64/kernel/mca.c

+0 −18
Original line number Diff line number Diff line
@@ -149,9 +149,7 @@ static ia64_mc_info_t ia64_mc_info; 
#define CPE_HISTORY_LENGTH    5

#define CMC_HISTORY_LENGTH    5



#ifdef CONFIG_ACPI

static struct timer_list cpe_poll_timer;

#endif

static struct timer_list cmc_poll_timer;

/*

 * This variable tells whether we are currently in polling mode.
@@ -532,8 +530,6 @@ int mca_recover_range(unsigned long addr) 
}

EXPORT_SYMBOL_GPL(mca_recover_range);



#ifdef CONFIG_ACPI



int cpe_vector = -1;

int ia64_cpe_irq = -1;
@@ -595,9 +591,6 @@ out: 
	return IRQ_HANDLED;

}



#endif /* CONFIG_ACPI */



#ifdef CONFIG_ACPI

/*

 * ia64_mca_register_cpev

 *
@@ -625,7 +618,6 @@ ia64_mca_register_cpev (int cpev) 
	IA64_MCA_DEBUG("%s: corrected platform error "

		       "vector %#x registered\n", __func__, cpev);

}

#endif /* CONFIG_ACPI */



/*

 * ia64_mca_cmc_vector_setup
@@ -1540,8 +1532,6 @@ ia64_mca_cmc_poll (struct timer_list *unused) 
 * Outputs

 * 	handled

 */

#ifdef CONFIG_ACPI



static irqreturn_t

ia64_mca_cpe_int_caller(int cpe_irq, void *arg)

{
@@ -1604,8 +1594,6 @@ ia64_mca_cpe_poll (struct timer_list *unused) 
							IA64_IPI_DM_INT, 0);

}



#endif /* CONFIG_ACPI */



static int

default_monarch_init_process(struct notifier_block *self, unsigned long val, void *data)

{
@@ -1799,7 +1787,6 @@ static struct irqaction mca_wkup_irqaction = { 
	.name =		"mca_wkup"

};



#ifdef CONFIG_ACPI

static struct irqaction mca_cpe_irqaction = {

	.handler =	ia64_mca_cpe_int_handler,

	.name =		"cpe_hndlr"
@@ -1809,7 +1796,6 @@ static struct irqaction mca_cpep_irqaction = { 
	.handler =	ia64_mca_cpe_int_caller,

	.name =		"cpe_poll"

};

#endif /* CONFIG_ACPI */



/* Minimal format of the MCA/INIT stacks.  The pseudo processes that run on

 * these stacks can never sleep, they cannot return from the kernel to user
@@ -2081,10 +2067,8 @@ void __init ia64_mca_irq_init(void) 
	/* Setup the MCA wakeup interrupt vector */

	register_percpu_irq(IA64_MCA_WAKEUP_VECTOR, &mca_wkup_irqaction);



#ifdef CONFIG_ACPI

	/* Setup the CPEI/P handler */

	register_percpu_irq(IA64_CPEP_VECTOR, &mca_cpep_irqaction);

#endif

}



/*
@@ -2112,7 +2096,6 @@ ia64_mca_late_init(void) 
			  ia64_mca_cpu_online, NULL);

	IA64_MCA_DEBUG("%s: CMCI/P setup and enabled.\n", __func__);



#ifdef CONFIG_ACPI

	/* Setup the CPEI/P vector and handler */

	cpe_vector = acpi_request_vector(ACPI_INTERRUPT_CPEI);

	timer_setup(&cpe_poll_timer, ia64_mca_cpe_poll, 0);
@@ -2143,7 +2126,6 @@ ia64_mca_late_init(void) 
			IA64_MCA_DEBUG("%s: CPEP setup and enabled.\n", __func__);

		}

	}

#endif



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE