[parisc-linux-cvs] pte,wait4-related changes

[Paul Bame]

Index: arch/parisc/kernel/pci-dma.c
===================================================================
RCS file: /home/cvs/parisc/linux/arch/parisc/kernel/pci-dma.c,v
retrieving revision 1.19
diff -u -r1.19 pci-dma.c
--- pci-dma.c	2001/02/23 01:08:42	1.19
+++ pci-dma.c	2001/07/06 01:47:11
@@ -117,7 +117,7 @@
 	if (end > PGDIR_SIZE)
 		end = PGDIR_SIZE;
 	do {
-		pte_t * pte = pte_alloc_kernel(pmd, vaddr);
+		pte_t * pte = pte_alloc(NULL, pmd, vaddr);
 		if (!pte)
 			return -ENOMEM;
 		if (map_pte_uncached(pte, orig_vaddr, end - vaddr, paddr_ptr))
Index: arch/parisc/kernel/signal.c
===================================================================
RCS file: /home/cvs/parisc/linux/arch/parisc/kernel/signal.c,v
retrieving revision 1.40
diff -u -r1.40 signal.c
--- signal.c	2001/06/12 17:48:59	1.40
+++ signal.c	2001/07/06 01:47:11
@@ -34,7 +34,6 @@
 
 #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))
 
-extern long sys_wait4 (int, int *, int, struct rusage *);
 int do_signal(sigset_t *oldset, struct pt_regs *regs, int in_syscall);
 
 int copy_siginfo_to_user(siginfo_t *to, siginfo_t *from)
Index: arch/parisc/kernel/sys_parisc32.c
===================================================================
RCS file: /home/cvs/parisc/linux/arch/parisc/kernel/sys_parisc32.c,v
retrieving revision 1.19
diff -u -r1.19 sys_parisc32.c
--- sys_parisc32.c	2001/07/05 21:33:26	1.19
+++ sys_parisc32.c	2001/07/06 01:47:11
@@ -718,8 +718,6 @@
 sys32_wait4(__kernel_pid_t32 pid, unsigned int * stat_addr, int options,
 	    struct rusage32 * ru)
 {
-	extern asmlinkage int sys_wait4(pid_t pid, unsigned int * stat_addr,
-				int options, struct rusage * ru);
 	if (!ru)
 		return sys_wait4(pid, stat_addr, options, NULL);
 	else {
Index: arch/parisc/mm/ioremap.c
===================================================================
RCS file: /home/cvs/parisc/linux/arch/parisc/mm/ioremap.c,v
retrieving revision 1.3
diff -u -r1.3 ioremap.c
--- ioremap.c	2001/06/20 20:24:33	1.3
+++ ioremap.c	2001/07/06 01:47:11
@@ -50,7 +50,7 @@
 	if (address >= end)
 		BUG();
 	do {
-		pte_t * pte = pte_alloc(pmd, address);
+		pte_t * pte = pte_alloc(NULL, pmd, address);
 		if (!pte)
 			return -ENOMEM;
 		remap_area_pte(pte, address, end - address, address + phys_addr, flags);
Index: include/asm-parisc/pgalloc.h
===================================================================
RCS file: /home/cvs/parisc/linux/include/asm-parisc/pgalloc.h,v
retrieving revision 1.29
diff -u -r1.29 pgalloc.h
--- pgalloc.h	2001/07/05 23:59:13	1.29
+++ pgalloc.h	2001/07/06 01:47:11
@@ -237,7 +237,7 @@
 
 extern void __bad_pgd(pgd_t *pgd);
 
-extern inline pmd_t * pmd_alloc(pgd_t *pgd, unsigned long address)
+extern inline pmd_t * xxx_pmd_alloc(pgd_t *pgd, unsigned long address)
 {
 	address = (address >> PMD_SHIFT) & (PTRS_PER_PMD - 1);
 
@@ -304,9 +304,6 @@
 	free_page((unsigned long)pte);
 }
 
-#define pmd_alloc_kernel	pmd_alloc
-#define pte_alloc_kernel	pte_alloc
-
 #define pte_free(pte)		free_pte_fast(pte)
 #define pmd_free(pmd)           free_pmd_fast(pmd)
 #define pgd_free(pgd)		free_pgd_fast(pgd)
@@ -314,7 +311,7 @@
 
 extern void __bad_pmd(pmd_t *pmd);
 
-extern inline pte_t * pte_alloc(pmd_t * pmd, unsigned long address)
+extern inline pte_t * xxx_pte_alloc(pmd_t * pmd, unsigned long address)
 {
 	address = (address >> PAGE_SHIFT) & (PTRS_PER_PTE - 1);