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

Commit a62c9fe4 authored by Simon Horman's avatar Simon Horman Committed by Tony Luck
Browse files

[IA64] Remove vector from ia64_machine_kexec() 



The use of vector in ia64_machine_kexec() seems spurious,
and removing it simplifies the code slightly.

As suggested by Alex Williamson <alex.williamson@hp.com>

Cc: Alex Williamson <alex.williamson@hp.com>
Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent e1b1eb01

arch/ia64/kernel/machine_kexec.c

+1 −5
Original line number Original line Diff line number Diff line
@@ -79,7 +79,6 @@ static void ia64_machine_kexec(struct unw_frame_info *info, void *arg) 
	relocate_new_kernel_t rnk;

	relocate_new_kernel_t rnk;

	void *pal_addr = efi_get_pal_addr();

	void *pal_addr = efi_get_pal_addr();

	unsigned long code_addr = (unsigned long)page_address(image->control_code_page);

	unsigned long code_addr = (unsigned long)page_address(image->control_code_page);

	unsigned long vector;

	int ii;

	int ii;





	BUG_ON(!image);

	BUG_ON(!image);
@@ -107,11 +106,8 @@ static void ia64_machine_kexec(struct unw_frame_info *info, void *arg) 
	/* unmask TPR and clear any pending interrupts */

	/* unmask TPR and clear any pending interrupts */

	ia64_setreg(_IA64_REG_CR_TPR, 0);

	ia64_setreg(_IA64_REG_CR_TPR, 0);

	ia64_srlz_d();

	ia64_srlz_d();

	vector = ia64_get_ivr();

	while (ia64_get_ivr() != IA64_SPURIOUS_INT_VECTOR)

	while (vector != IA64_SPURIOUS_INT_VECTOR) {

		ia64_eoi();

		ia64_eoi();

		vector = ia64_get_ivr();

	}

	platform_kernel_launch_event();

	platform_kernel_launch_event();

	rnk = (relocate_new_kernel_t)&code_addr;

	rnk = (relocate_new_kernel_t)&code_addr;

	(*rnk)(image->head, image->start, ia64_boot_param,

	(*rnk)(image->head, image->start, ia64_boot_param,