[PATCH] fix gcc4 warning in asm-ppc/time.h

Christoph Hellwig hch at lst.de
Tue Aug 2 19:55:09 EST 2005


A function must not return a const value, instead use
__attribute_const__.


Index: linux-2.6/include/asm/time.h
===================================================================
--- linux-2.6.orig/include/asm/time.h	2005-04-30 10:17:19.000000000 +0200
+++ linux-2.6/include/asm/time.h	2005-08-01 11:57:12.000000000 +0200
@@ -10,6 +10,7 @@
 #define __ASM_TIME_H__
 
 #include <linux/config.h>
+#include <linux/compiler.h>
 #include <linux/types.h>
 #include <linux/rtc.h>
 #include <linux/threads.h>
@@ -58,7 +59,7 @@
 /* Accessor functions for the timebase (RTC on 601) registers. */
 /* If one day CONFIG_POWER is added just define __USE_RTC as 1 */
 #ifdef CONFIG_6xx
-extern __inline__ int const __USE_RTC(void) {
+extern __inline__ int __attribute_const__ __USE_RTC(void) {
 	return (mfspr(SPRN_PVR)>>16) == 1;
 }
 #else



More information about the Linuxppc-dev mailing list