From: Christoph Hellwig <hch@lst.de>
To: torvalds@transmeta.com
Cc: linux-kernel@vger.kernel.org, paulus@samba.org
Subject: [PATCH] fix ppc ioremap prototype
Date: Wed, 3 Sep 2003 22:32:31 +0200 [thread overview]
Message-ID: <20030903203231.GA8772@lst.de> (raw)
The 44x merge fucked this up, bring it back in linux with the other
architectures.
/me still boggles how a patch like that could have sneaked in without
a review on lkml..
--- 1.13/arch/ppc/mm/pgtable.c Wed Sep 3 14:16:34 2003
+++ edited/arch/ppc/mm/pgtable.c Wed Sep 3 21:10:34 2003
@@ -119,9 +119,9 @@
#ifndef CONFIG_44x
void *
-ioremap(phys_addr_t addr, unsigned long size)
+ioremap(unsigned long addr, unsigned long size)
{
- return __ioremap(addr, size, _PAGE_NO_CACHE);
+ return __ioremap((phys_addr_t)addr, size, _PAGE_NO_CACHE);
}
#else /* CONFIG_44x */
void *
@@ -131,9 +131,9 @@
}
void *
-ioremap(phys_addr_t addr, unsigned long size)
+ioremap(unsigned long addr, unsigned long size)
{
- phys_addr_t addr64 = fixup_bigphys_addr(addr, size);;
+ phys_addr_t addr64 = fixup_bigphys_addr((phys_addr_t)addr, size);;
return ioremap64(addr64, size);
}
--- 1.14/include/asm-ppc/io.h Wed Sep 3 14:16:34 2003
+++ edited/include/asm-ppc/io.h Wed Sep 3 21:13:40 2003
@@ -201,7 +201,7 @@
*/
extern void *__ioremap(phys_addr_t address, unsigned long size,
unsigned long flags);
-extern void *ioremap(phys_addr_t address, unsigned long size);
+extern void *ioremap(unsigned long address, unsigned long size);
#ifdef CONFIG_44x
extern void *ioremap64(unsigned long long address, unsigned long size);
#endif
next reply other threads:[~2003-09-03 20:34 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-09-03 20:32 Christoph Hellwig [this message]
2003-09-04 0:33 ` [PATCH] fix ppc ioremap prototype Paul Mackerras
2003-09-04 7:13 ` Christoph Hellwig
2003-09-04 7:25 ` David S. Miller
2003-09-04 7:30 ` Russell King
2003-09-04 7:38 ` Christoph Hellwig
2003-09-04 8:09 ` David S. Miller
2003-09-04 8:12 ` Linus Torvalds
2003-09-04 8:10 ` David S. Miller
2003-09-04 8:28 ` Christoph Hellwig
2003-09-04 10:06 ` Benjamin Herrenschmidt
2003-09-04 11:03 ` Paul Mackerras
2003-09-04 12:21 ` Geert Uytterhoeven
2003-09-04 12:41 ` Paul Mackerras
2003-09-04 12:41 ` David S. Miller
2003-09-04 12:57 ` Geert Uytterhoeven
2003-09-04 15:58 ` Deepak Saxena
2003-09-04 16:15 ` Geert Uytterhoeven
2003-09-04 16:36 ` Jes Sorensen
2003-09-04 23:18 ` Paul Mackerras
2003-09-05 20:56 ` Geert Uytterhoeven
2003-09-04 16:41 ` Linus Torvalds
2003-09-04 16:43 ` David S. Miller
2003-09-04 17:06 ` Linus Torvalds
2003-09-04 17:03 ` David S. Miller
2003-09-04 17:16 ` Linus Torvalds
2003-09-04 17:13 ` Jeff Garzik
2003-09-04 17:24 ` Linus Torvalds
2003-09-05 8:02 ` Eric W. Biederman
2003-09-04 8:22 ` Christoph Hellwig
2003-09-04 9:29 ` Christoph Hellwig
2003-09-04 10:07 ` Benjamin Herrenschmidt
2003-09-04 9:21 ` Paul Mackerras
2003-09-04 9:36 ` David S. Miller
2003-09-04 9:48 ` Russell King
2003-09-04 9:51 ` Christoph Hellwig
2003-09-04 12:38 ` Paul Mackerras
2003-09-04 12:59 ` Paul Mackerras
2003-09-04 13:01 ` David S. Miller
2003-09-04 14:15 ` Matt Porter
2003-09-04 14:12 ` David S. Miller
2003-09-04 13:30 ` Russell King
2003-09-04 15:50 ` Deepak Saxena
2003-09-04 16:09 ` David S. Miller
2003-09-04 10:34 ` Alan Cox
2003-09-04 10:33 ` David S. Miller
2003-09-04 12:42 ` Jeff Garzik
2003-09-04 12:43 ` David S. Miller
2003-09-04 14:36 ` Matt Porter
2003-09-04 14:30 ` David S. Miller
2003-09-04 15:26 ` Matt Porter
2003-09-04 16:03 ` David S. Miller
2003-09-04 15:35 ` Linus Torvalds
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=20030903203231.GA8772@lst.de \
--to=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=paulus@samba.org \
--cc=torvalds@transmeta.com \
/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