patch-2.4.0-test11 linux/include/asm-ppc/io.h

Next file: linux/include/asm-ppc/ipcbuf.h
Previous file: linux/include/asm-ppc/init.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test10/linux/include/asm-ppc/io.h linux/include/asm-ppc/io.h
@@ -1,3 +1,4 @@
+#ifdef __KERNEL__
 #ifndef _PPC_IO_H
 #define _PPC_IO_H
 
@@ -92,7 +93,7 @@
 		"3:	li	%0,-1\n"		\
 		"	b	2b\n"			\
 		".previous\n"				\
-		".section __ex_table,\"ax\"\n"		\
+		".section __ex_table,\"a\"\n"		\
 		"	.align	2\n"			\
 		"	.long	1b,3b\n"		\
 		".previous"				\
@@ -108,7 +109,7 @@
 		op " %0,0,%1\n"				\
 		"1:	sync\n"				\
 		"2:\n"					\
-		".section __ex_table,\"ax\"\n"		\
+		".section __ex_table,\"a\"\n"		\
 		"	.align	2\n"			\
 		"	.long	1b,2b\n"		\
 		".previous"				\
@@ -347,7 +348,6 @@
 	__asm__ __volatile__("stw%U0%X0 %1,%0; eieio" : "=m" (*addr) : "r" (val));
 }
 
-#ifdef __KERNEL__
 static inline int check_signature(unsigned long io_addr,
 	const unsigned char *signature, int length)
 {
@@ -370,6 +370,5 @@
 #define dma_cache_wback(_start,_size)		do { } while (0)
 #define dma_cache_wback_inv(_start,_size)	do { } while (0)
 
-#endif /* __KERNEL__ */
-
 #endif
+#endif /* __KERNEL__ */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)