From: msokolov@ivan.Harhan.ORG (Michael Sokolov)
To: linuxppc-dev@lists.linuxppc.org
Subject: A little fix
Date: Tue, 27 Nov 01 14:36:12 PST [thread overview]
Message-ID: <0111272236.AA25257@ivan.Harhan.ORG> (raw)
OK, I goofed. It's struct bi_record, not struct bootinfo. I have no idea how I
could have screwed it up and how could the compiler have missed it. Is it
another gcc extension to allow struct never_heard_of * as OK? The patch below
fixes it. It also fixes a remaining bit of the kernel=>platforms rename.
MS
diff --minimal -Nru a/arch/ppc/boot/common/misc-simple.c b/arch/ppc/boot/common/misc-simple.c
--- a/arch/ppc/boot/common/misc-simple.c Tue Nov 27 14:21:26 2001
+++ b/arch/ppc/boot/common/misc-simple.c Tue Nov 27 14:21:26 2001
@@ -58,13 +58,13 @@
extern void gunzip(void *, int, unsigned char *, int *);
extern void setup_legacy(void);
-struct bootinfo *
+struct bi_record *
decompress_kernel(unsigned long load_addr, int num_words, unsigned long cksum)
{
int timer = 0;
char *cp, ch;
struct bi_record *rec;
- struct bootinfo *birecs;
+ struct bi_record *birecs;
setup_legacy();
com_port = serial_init(0, NULL);
diff --minimal -Nru a/arch/ppc/platforms/adir_setup.c b/arch/ppc/platforms/adir_setup.c
--- a/arch/ppc/platforms/adir_setup.c Tue Nov 27 14:21:26 2001
+++ b/arch/ppc/platforms/adir_setup.c Tue Nov 27 14:21:26 2001
@@ -181,7 +181,7 @@
/*
* On the Adirondack we use bi_recs and pass the pointer to them in R3.
*/
- parse_bootinfo((struct bootinfo *) (r3 + KERNELBASE));
+ parse_bootinfo((struct bi_record *) (r3 + KERNELBASE));
/* Remember, isa_io_base is virtual but isa_mem_base is physical! */
isa_io_base = ADIR_PCI32_VIRT_IO_BASE;
diff --minimal -Nru a/arch/ppc/platforms/k2.h b/arch/ppc/platforms/k2.h
--- a/arch/ppc/platforms/k2.h Tue Nov 27 14:21:26 2001
+++ b/arch/ppc/platforms/k2.h Tue Nov 27 14:21:26 2001
@@ -13,8 +13,8 @@
* option) any later version.
*/
-#ifndef __PPC_KERNEL_K2_H
-#define __PPC_KERNEL_K2_H
+#ifndef __PPC_PLATFORMS_K2_H
+#define __PPC_PLATFORMS_K2_H
/*
* SBS K2 definitions
@@ -81,4 +81,4 @@
#define K2_SYS_SLOT_MASK 0x08
-#endif /* __PPC_KERNEL_K2_H */
+#endif /* __PPC_PLATFORMS_K2_H */
diff --minimal -Nru a/arch/ppc/platforms/k2_setup.c b/arch/ppc/platforms/k2_setup.c
--- a/arch/ppc/platforms/k2_setup.c Tue Nov 27 14:21:26 2001
+++ b/arch/ppc/platforms/k2_setup.c Tue Nov 27 14:21:26 2001
@@ -346,7 +346,7 @@
void __init platform_init(unsigned long r3, unsigned long r4,
unsigned long r5, unsigned long r6, unsigned long r7)
{
- parse_bootinfo((struct bootinfo *) (r3 + KERNELBASE));
+ parse_bootinfo((struct bi_record *) (r3 + KERNELBASE));
isa_io_base = K2_ISA_IO_BASE;
isa_mem_base = K2_ISA_MEM_BASE;
** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/
next reply other threads:[~2001-11-27 22:36 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2001-11-27 22:36 Michael Sokolov [this message]
2001-11-28 7:25 ` A little fix Daniel Jacobowitz
-- strict thread matches above, loose matches on Subject: below --
2001-11-28 17:05 Michael Sokolov
2001-11-28 23:44 ` Tom Rini
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=0111272236.AA25257@ivan.Harhan.ORG \
--to=msokolov@ivan.harhan.org \
--cc=linuxppc-dev@lists.linuxppc.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;
as well as URLs for NNTP newsgroup(s).