diff options
| author | Simon Horman <horms@verge.net.au> | 2007-09-19 14:02:20 +0900 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2007-10-12 15:21:20 -0700 |
| commit | a62c9fe4637f62e3901f8268778dbc8100281d40 (patch) | |
| tree | 40dc7aef5a057de5a3fd950de4d13916627caff7 /arch/ia64/kernel/machine_kexec.c | |
| parent | e1b1eb011e15190eb859bad0bcae67679bda7d50 (diff) | |
| download | olio-linux-3.10-a62c9fe4637f62e3901f8268778dbc8100281d40.tar.xz olio-linux-3.10-a62c9fe4637f62e3901f8268778dbc8100281d40.zip | |
[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: Simon Horman <horms@verge.net.au>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/kernel/machine_kexec.c')
| -rw-r--r-- | arch/ia64/kernel/machine_kexec.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/ia64/kernel/machine_kexec.c b/arch/ia64/kernel/machine_kexec.c index 4f0f3b8c1ee..58e943a5d95 100644 --- a/arch/ia64/kernel/machine_kexec.c +++ b/arch/ia64/kernel/machine_kexec.c @@ -79,7 +79,6 @@ static void ia64_machine_kexec(struct unw_frame_info *info, void *arg) relocate_new_kernel_t rnk; void *pal_addr = efi_get_pal_addr(); unsigned long code_addr = (unsigned long)page_address(image->control_code_page); - unsigned long vector; int ii; 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 */ ia64_setreg(_IA64_REG_CR_TPR, 0); ia64_srlz_d(); - vector = ia64_get_ivr(); - while (vector != IA64_SPURIOUS_INT_VECTOR) { + while (ia64_get_ivr() != IA64_SPURIOUS_INT_VECTOR) ia64_eoi(); - vector = ia64_get_ivr(); - } platform_kernel_launch_event(); rnk = (relocate_new_kernel_t)&code_addr; (*rnk)(image->head, image->start, ia64_boot_param, |