From: Andrew Morton <akpm@osdl.org>
To: Anton Blanchard <anton@samba.org>
Cc: paulus@samba.org, linas@austin.ibm.com, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] fix power3 boot
Date: Sun, 4 Jul 2004 03:12:18 -0700 [thread overview]
Message-ID: <20040704031218.163f4b8b.akpm@osdl.org> (raw)
In-Reply-To: <20040704100407.GE4923@krispykreme>
Anton Blanchard <anton@samba.org> wrote:
>
> @@ -588,7 +590,6 @@ void __init eeh_init(void)
> }
>
> /* Enable EEH for all adapters. Note that eeh requires buid's */
> - init_pci_config_tokens();
> for (phb = of_find_node_by_name(NULL, "pci"); phb;
> phb = of_find_node_by_name(phb, "pci")) {
> unsigned long buid;
>
That line was already deleted by paulus's "EEH fixes for POWER5 machines
(1/2)" patch, so we end up with the below.
diff -puN arch/ppc64/kernel/eeh.c~ppc64-fix-power3-boot arch/ppc64/kernel/eeh.c
--- 25/arch/ppc64/kernel/eeh.c~ppc64-fix-power3-boot 2004-07-04 03:08:52.772504640 -0700
+++ 25-akpm/arch/ppc64/kernel/eeh.c 2004-07-04 03:08:52.778503728 -0700
@@ -587,6 +587,8 @@ void __init eeh_init(void)
return;
}
+ init_pci_config_tokens();
+
ibm_set_eeh_option = rtas_token("ibm,set-eeh-option");
ibm_set_slot_reset = rtas_token("ibm,set-slot-reset");
ibm_read_slot_reset_state = rtas_token("ibm,read-slot-reset-state");
_
next prev parent reply other threads:[~2004-07-04 10:13 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-07-04 10:04 Anton Blanchard
2004-07-04 10:12 ` Andrew Morton [this message]
2004-07-04 11:33 ` Anton Blanchard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20040704031218.163f4b8b.akpm@osdl.org \
--to=akpm@osdl.org \
--cc=anton@samba.org \
--cc=linas@austin.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=paulus@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®