Merge with 2.3.99-pre9.

6 files changed, 29 insertions, 13 deletions

diff --git a/include/asm-ppc/bitops.h b/include/asm-ppc/bitops.h
index d5506a348..f62ad151f 100644
--- a/include/asm-ppc/bitops.h
+++ b/include/asm-ppc/bitops.h
@@ -7,7 +7,6 @@
 #define _PPC_BITOPS_H
 
 #include <linux/config.h>
-#include <asm/system.h>
 #include <asm/byteorder.h>
 
 extern void set_bit(int nr, volatile void *addr);
@@ -278,3 +277,4 @@ found_middle:
 #define minix_find_first_zero_bit(addr,size) ext2_find_first_zero_bit(addr,size)
 
 #endif /* _PPC_BITOPS_H */
+
diff --git a/include/asm-ppc/cpm_8260.h b/include/asm-ppc/cpm_8260.h
index c479f87d2..5f500d5c3 100644
--- a/include/asm-ppc/cpm_8260.h
+++ b/include/asm-ppc/cpm_8260.h
@@ -124,6 +124,14 @@ typedef struct cpm_buf_desc {
 #define BD_SC_OV	((ushort)0x0002)	/* Overrun */
 #define BD_SC_CD	((ushort)0x0001)	/* ?? */
 
+/* Function code bits, usually generic to devices.
+*/
+#define CPMFCR_GBL	((u_char)0x20)	/* Set memory snooping */
+#define CPMFCR_EB	((u_char)0x10)	/* Set big endian byte order */
+#define CPMFCR_TC2	((u_char)0x04)	/* Transfer code 2 value */
+#define CPMFCR_DTB	((u_char)0x02)	/* Use local bus for data when set */
+#define CPMFCR_BDB	((u_char)0x01)	/* Use local bus for BD when set */
+
 /* Parameter RAM offsets from the base.
 */
 #define PROFF_SCC1		((uint)0x8000)
@@ -184,13 +192,6 @@ typedef struct smc_uart {
 	uint	smc_stmp;	/* SDMA Temp */
 } smc_uart_t;
 
-/* Function code bits.
-*/
-#define SMC_GBL	((u_char)0x20)	/* Set memory snooping */
-#define SMC_EB	((u_char)0x10)	/* Set big endian byte order */
-#define SMC_TC2	((u_char)0x04)	/* Transfer code 2 value */
-#define SMC_DTB	((u_char)0x02)	/* Use local bus when set */
-
 /* SMC uart mode register (Internal memory map).
 */
 #define	SMCMR_REN	((ushort)0x0001)
@@ -337,10 +338,6 @@ typedef struct scc_param {
 	uint	scc_tcrc;	/* Internal */
 } sccp_t;
 
-/* Function code bits.
-*/
-#define SCC_EB	((u_char)0x10)	/* Set big endian byte order */
-
 /* CPM Ethernet through SCC1.
  */
 typedef struct scc_enet {
diff --git a/include/asm-ppc/init.h b/include/asm-ppc/init.h
index 106e57c1a..a25f6015e 100644
--- a/include/asm-ppc/init.h
+++ b/include/asm-ppc/init.h
@@ -16,6 +16,12 @@
 	__argprep __prep; \
 	__argprep
 
+#define __chrp __attribute__ ((__section__ (".text.chrp")))
+#define __chrpdata __attribute__ ((__section__ (".data.chrp")))
+#define __chrpfunc(__argchrp) \
+	__argchrp __chrp; \
+	__argchrp
+
 #define __apus __attribute__ ((__section__ (".text.apus")))
 #define __apusdata __attribute__ ((__section__ (".data.apus")))
 #define __apusfunc(__argapus) \
diff --git a/include/asm-ppc/page.h b/include/asm-ppc/page.h
index e069f8b15..a4f6b0a4b 100644
--- a/include/asm-ppc/page.h
+++ b/include/asm-ppc/page.h
@@ -1,4 +1,7 @@
 #include <linux/config.h>
+#ifndef __ASSEMBLY__
+#include <asm/system.h> /* for xmon definition */
+#endif /* ndef __ASSEMBLY__ */
 
 #ifndef _PPC_PAGE_H
 #define _PPC_PAGE_H
diff --git a/include/asm-ppc/siginfo.h b/include/asm-ppc/siginfo.h
index 58e4b22e9..2561510f6 100644
--- a/include/asm-ppc/siginfo.h
+++ b/include/asm-ppc/siginfo.h
@@ -122,7 +122,7 @@ typedef struct siginfo {
  * SIGSEGV si_codes
  */
 #define SEGV_MAPERR	1	/* address not mapped to object */
-#define SRGV_ACCERR	2	/* invalid permissions for mapped object */
+#define SEGV_ACCERR	2	/* invalid permissions for mapped object */
 #define NSIGSEGV	2
 
 /*
diff --git a/include/asm-ppc/string.h b/include/asm-ppc/string.h
index e0158a215..d912a6b5f 100644
--- a/include/asm-ppc/string.h
+++ b/include/asm-ppc/string.h
@@ -15,5 +15,15 @@
 
 extern int strcasecmp(const char *, const char *);
 extern int strncasecmp(const char *, const char *, int);
+extern char * strcpy(char *,const char *);
+extern char * strncpy(char *,const char *, __kernel_size_t);
+extern __kernel_size_t strlen(const char *);
+extern int strcmp(const char *,const char *);
+extern char * strcat(char *, const char *);
+extern void * memset(void *,int,__kernel_size_t);
+extern void * memcpy(void *,const void *,__kernel_size_t);
+extern void * memmove(void *,const void *,__kernel_size_t);
+extern int memcmp(const void *,const void *,__kernel_size_t);
+extern void * memchr(const void *,int,__kernel_size_t);
 
 #endif