Commit db7e3376 authored by Andrew Morton's avatar Andrew Morton Committed by Greg Kroah-Hartman

[PATCH] fix readX_relaxed machine vectors for ia64

From: jbarnes@sgi.com (Jesse Barnes)

I left out some of the necessary machine vector magic in my readX_relaxed
patch, which broke the ia64 generic build.
parent 350e8099
...@@ -65,6 +65,10 @@ EXPORT_SYMBOL(__ia64_memset_c_io); ...@@ -65,6 +65,10 @@ EXPORT_SYMBOL(__ia64_memset_c_io);
#undef __ia64_readw #undef __ia64_readw
#undef __ia64_readl #undef __ia64_readl
#undef __ia64_readq #undef __ia64_readq
#undef __ia64_readb_relaxed
#undef __ia64_readw_relaxed
#undef __ia64_readl_relaxed
#undef __ia64_readq_relaxed
#undef __ia64_writeb #undef __ia64_writeb
#undef __ia64_writew #undef __ia64_writew
#undef __ia64_writel #undef __ia64_writel
...@@ -130,4 +134,28 @@ __ia64_readq (void *addr) ...@@ -130,4 +134,28 @@ __ia64_readq (void *addr)
return ___ia64_readq (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);
}
#endif /* CONFIG_IA64_GENERIC */ #endif /* CONFIG_IA64_GENERIC */
...@@ -16,6 +16,10 @@ extern ia64_mv_readb_t __ia64_readb; ...@@ -16,6 +16,10 @@ extern ia64_mv_readb_t __ia64_readb;
extern ia64_mv_readw_t __ia64_readw; extern ia64_mv_readw_t __ia64_readw;
extern ia64_mv_readl_t __ia64_readl; extern ia64_mv_readl_t __ia64_readl;
extern ia64_mv_readq_t __ia64_readq; 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) \ #define MACHVEC_HELPER(name) \
struct ia64_machine_vector machvec_##name __attribute__ ((unused, __section__ (".machvec"))) \ struct ia64_machine_vector machvec_##name __attribute__ ((unused, __section__ (".machvec"))) \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment