Skip to contentSkip to conversation

kexec/kdump: Make sure vec is initialised in kexec_disable_iosapic()

PATCH New Horms 1 participant 1 message Oct 2, 2006

lore
Share & tools
lore

Horms

author
#0 lore raw

PATCH 2/3 kexec/kdump: Make sure vec is initialised in kexec_disable_iosapic()

Quoted 37 lines

Date: Fri, 29 Sep 2006 14:46:23 -0700
From: Tony Luck <[email protected]>
Message-Id: <[email protected]>
To: [email protected]
Subject: kexec/kdump and the ia64 test tree
Cc: [email protected], [email protected]

The kexec/kdump patch in my test tree is very stale, plus it is time for some git maintenance on the test tree (to clean away all the "Auto-update from upstream" commits that my workflow generates). So I'm planning on resetting my "test" branch to Linus-latest + kdump/kexec (so git pull/fetch will barf on my test tree, you'll need to re-clone).

Below I've include what I believe to be the latest version of the patch produced by:

1) Take 2.6.18
2) Apply Nan Hai patch for 2.6.18 (posted Sept 20th)
3) Pull in Linus-latest (c972398b ...) and resolve conflicts in smp.h, sysctl.h
4) Apply Nan hai's "Fix OS_INIT" patch that fixed Indou-san's deadlock issue +(Sept 28th)
5) Fix a few warnings:
arch/ia64/kernel/iosapic.c:
`vec' may be used before set in kexec_disable_iosapic() ... I'm not totally confident that I fixed this right. Please look

(quoted diff) +2 -0
+closely
                at what I did.
        arch/ia64/kernel/smp.c:
                Trivial fixes to stop compiler complaining that
+kdump_smp_send_stop()
                and kdump_smp_send_init() definitions were not prototypes.

6) Lots of white-space cleanup (mostly multiple spaces that should be tabs, but

(quoted diff) +2 -0
+I
   also threw the whole kdump_find_rsvd_region() in arch/ia64/kernel/efi.c
+through
   scripts/Lindent as it was only using two-spaces for indentation.)
Quoted 5 lines

Let me know if I've goofed up the patch during this process.

I'm planning to reset my test tree on Monday (Oct 2nd).

-Tony

This is the portion of the above patch that ensures that vec is initialised in kexec_disable_iosapic(). But is this fix correct?

Cc Tony Luck <[email protected]>
Cc Zou Nan hai <[email protected]>
 arch/ia64/kernel/iosapic.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

721cb78a82e98f515e932c299aa444c6d37a687f

arch/ia64/kernel/iosapic.c +3 -2
index c7a465d..00cf506 100644
@@ -295,9 +295,10 @@ kexec_disable_iosapic(void)
 {
 	struct iosapic_intr_info *info;
 	struct iosapic_rte_info *rte;
-	u8 vec;
+	ia64_vector vec = 0;
+
 	for (info = iosapic_intr_info; info <
-			iosapic_intr_info + IA64_NUM_VECTORS; ++info) {
+			iosapic_intr_info + IA64_NUM_VECTORS; ++info, ++vec) {
 		list_for_each_entry(rte, &info->rtes,
 				rte_list) {
 			iosapic_write(rte->addr,