[PATCH] include/asm-alpha/core_cia.h, kernel 2.6.23.12

[PATCH] include/asm-alpha/core_cia.h, kernel 2.6.23.12

[Anders Hammarquist]

[-- Attachment #1: Type: text/plain, Size: 374 bytes --]

[please Cc: me on followups]

Trying to compile 2.6.23.12 on alpha (a miata) resulted in this
failure:

cc1: warnings being treated as errors
include/asm/io_trivial.h: In function 'cia_readb':
include/asm/io_trivial.h:75: warning: passing argument 1 of 'cia_ioread8' discards qualifiers from pointer target type

This trivial patch to include/asm-alpha/core_cia.h fixed it 

[-- Attachment #2: Type: text/plain, Size: 2051 bytes --]

diff -ur linux-2.6.23.12/include/asm-alpha/core_cia.h ../src/linux-2.6.23.12/include/asm-alpha/core_cia.h
--- linux-2.6.23.12/include/asm-alpha/core_cia.h	2007-12-18 22:55:57.000000000 +0100
+++ ../src/linux-2.6.23.12/include/asm-alpha/core_cia.h	2007-12-30 04:52:28.956657441 +0100
@@ -341,7 +341,7 @@
 #define vuip	volatile unsigned int __force *
 #define vulp	volatile unsigned long __force *
 
-__EXTERN_INLINE unsigned int cia_ioread8(void __iomem *xaddr)
+__EXTERN_INLINE unsigned int cia_ioread8(const volatile void __iomem *xaddr)
 {
 	unsigned long addr = (unsigned long) xaddr;
 	unsigned long result, base_and_type;
@@ -358,7 +358,7 @@
 	return __kernel_extbl(result, addr & 3);
 }
 
-__EXTERN_INLINE void cia_iowrite8(u8 b, void __iomem *xaddr)
+__EXTERN_INLINE void cia_iowrite8(u8 b, volatile void __iomem *xaddr)
 {
 	unsigned long addr = (unsigned long) xaddr;
 	unsigned long w, base_and_type;
@@ -373,7 +373,7 @@
 	*(vuip) ((addr << 5) + base_and_type) = w;
 }
 
-__EXTERN_INLINE unsigned int cia_ioread16(void __iomem *xaddr)
+__EXTERN_INLINE unsigned int cia_ioread16(const volatile void __iomem *xaddr)
 {
 	unsigned long addr = (unsigned long) xaddr;
 	unsigned long result, base_and_type;
@@ -388,7 +388,7 @@
 	return __kernel_extwl(result, addr & 3);
 }
 
-__EXTERN_INLINE void cia_iowrite16(u16 b, void __iomem *xaddr)
+__EXTERN_INLINE void cia_iowrite16(u16 b, volatile void __iomem *xaddr)
 {
 	unsigned long addr = (unsigned long) xaddr;
 	unsigned long w, base_and_type;
@@ -403,7 +403,7 @@
 	*(vuip) ((addr << 5) + base_and_type) = w;
 }
 
-__EXTERN_INLINE unsigned int cia_ioread32(void __iomem *xaddr)
+__EXTERN_INLINE unsigned int cia_ioread32(const volatile void __iomem *xaddr)
 {
 	unsigned long addr = (unsigned long) xaddr;
 	if (addr < CIA_DENSE_MEM)
@@ -411,7 +411,7 @@
 	return *(vuip)addr;
 }
 
-__EXTERN_INLINE void cia_iowrite32(u32 b, void __iomem *xaddr)
+__EXTERN_INLINE void cia_iowrite32(u32 b, volatile void __iomem *xaddr)
 {
 	unsigned long addr = (unsigned long) xaddr;
 	if (addr < CIA_DENSE_MEM)

[-- Attachment #3: Type: text/plain, Size: 342 bytes --]

Signed-off-by: Anders Hammarquist <iko@cd.chalmers.se>

-- 
 -- Of course I'm crazy, but that doesn't mean I'm wrong.
Anders Hammarquist                                  | iko@cd.chalmers.se
Physics student, Chalmers University of Technology, | Hem: +46 31 88 48 50
G|teborg, Sweden.           RADIO: SM6XMM and N2JGL | Mob: +46 707 27 86 87

Re: [PATCH] include/asm-alpha/core_cia.h, kernel 2.6.23.12

[Ivan Kokshaysky]

On Sun, Dec 30, 2007 at 07:23:53AM +0100, Anders Hammarquist wrote:
> Trying to compile 2.6.23.12 on alpha (a miata) resulted in this
> failure:
> 
> cc1: warnings being treated as errors
> include/asm/io_trivial.h: In function 'cia_readb':
> include/asm/io_trivial.h:75: warning: passing argument 1 of 'cia_ioread8' discards qualifiers from pointer target type

Fixed in 2.6.24-rc6.

Ivan.