From: jbarnes@sgi.com (Jesse Barnes)
To: torvalds@osdl.org, akpm@osdl.org, linux-kernel@vger.kernel.org,
linux-ia64@vger.kernel.org
Subject: [PATCH] fix readX_relaxed machine vectors for ia64
Date: Thu, 5 Feb 2004 12:23:35 -0800 [thread overview]
Message-ID: <20040205202335.GA6551@sgi.com> (raw)
I left out some of the necessary machine vector magic in my
readX_relaxed patch, which broke the ia64 generic build. Please apply
this patch to the BK tree to fix it.
Thanks,
Jesse
===== arch/ia64/lib/io.c 1.6 vs edited =====
--- 1.6/arch/ia64/lib/io.c Mon Jan 5 07:30:22 2004
+++ edited/arch/ia64/lib/io.c Thu Feb 5 12:14:22 2004
@@ -65,6 +65,10 @@
#undef __ia64_readw
#undef __ia64_readl
#undef __ia64_readq
+#undef __ia64_readb_relaxed
+#undef __ia64_readw_relaxed
+#undef __ia64_readl_relaxed
+#undef __ia64_readq_relaxed
#undef __ia64_writeb
#undef __ia64_writew
#undef __ia64_writel
@@ -126,6 +130,30 @@
unsigned long
__ia64_readq (void *addr)
+{
+ return ___ia64_readq (addr);
+}
+
+unsigned char
+__ia64_readb_relaxed (void *addr)
+{
+ return ___ia64_readb (addr);
+}
+
+unsigned short
+__ia64_readw_relaxed (void *addr)
+{
+ return ___ia64_readw (addr);
+}
+
+unsigned int
+__ia64_readl_relaxed (void *addr)
+{
+ return ___ia64_readl (addr);
+}
+
+unsigned long
+__ia64_readq_relaxed (void *addr)
{
return ___ia64_readq (addr);
}
===== include/asm-ia64/machvec_init.h 1.6 vs edited =====
--- 1.6/include/asm-ia64/machvec_init.h Sat May 10 02:28:47 2003
+++ edited/include/asm-ia64/machvec_init.h Thu Feb 5 11:40:56 2004
@@ -16,6 +16,10 @@
extern ia64_mv_readw_t __ia64_readw;
extern ia64_mv_readl_t __ia64_readl;
extern ia64_mv_readq_t __ia64_readq;
+extern ia64_mv_readb_t __ia64_readb_relaxed;
+extern ia64_mv_readw_t __ia64_readw_relaxed;
+extern ia64_mv_readl_t __ia64_readl_relaxed;
+extern ia64_mv_readq_t __ia64_readq_relaxed;
#define MACHVEC_HELPER(name) \
struct ia64_machine_vector machvec_##name __attribute__ ((unused, __section__ (".machvec"))) \
reply other threads:[~2004-02-05 20:24 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20040205202335.GA6551@sgi.com \
--to=jbarnes@sgi.com \
--cc=akpm@osdl.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@osdl.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