[linuxsh-dev] Follow-up to 2.5.6

[NIIBE Y. <gn...@m1...>]

Follow up to 2.5.6.

2002-03-22  NIIBE Yutaka  <gn...@m1...>

	* include/asm-sh/pgalloc.h (ptep_get_and_clear): Follow the change of
	type of member i_map_shared.
	* include/asm-sh/unistd.h (__NR_tkill, __NR_sendfile64): Added.
	* include/asm-sh/siginfo.h (SI_DETHREAD): Added.
	* arch/sh/kernel/entry.S (sys_call_table): Added sys_sendfile64.

Index: arch/sh/kernel/entry.S
===================================================================
RCS file: /cvsroot/linuxsh/linux/arch/sh/kernel/entry.S,v
retrieving revision 1.6
diff -u -3 -p -r1.6 entry.S
--- arch/sh/kernel/entry.S	22 Mar 2002 03:58:40 -0000	1.6
+++ arch/sh/kernel/entry.S	22 Mar 2002 04:29:18 -0000
@@ -1122,6 +1122,7 @@ ENTRY(sys_call_table)
 	.long SYMBOL_NAME(sys_lremovexattr)
 	.long SYMBOL_NAME(sys_fremovexattr)
 	.long SYMBOL_NAME(sys_tkill)
+	.long SYMBOL_NAME(sys_sendfile64)
 
 	.rept NR_syscalls-(.-sys_call_table)/4
 		.long SYMBOL_NAME(sys_ni_syscall)
Index: include/asm-sh/pgalloc.h
===================================================================
RCS file: /cvsroot/linuxsh/linux/include/asm-sh/pgalloc.h,v
retrieving revision 1.3
diff -u -3 -p -r1.3 pgalloc.h
--- include/asm-sh/pgalloc.h	22 Mar 2002 03:58:40 -0000	1.3
+++ include/asm-sh/pgalloc.h	22 Mar 2002 04:42:16 -0000
@@ -127,9 +127,8 @@ static inline pte_t ptep_get_and_clear(p
 	pte_clear(ptep);
 	if (!pte_not_present(pte)) {
 		struct page *page = pte_page(pte);
-		if (VALID_PAGE(page)&&
-		    (!page->mapping || !(page->mapping->i_mmap_shared)))
-			__clear_bit(PG_mapped, &page->flags);
+		if (VALID_PAGE(page) &&
+		    (!page->mapping || list_empty(&page->mapping->i_mmap_shared)))			__clear_bit(PG_mapped, &page->flags);
 	}
 	return pte;
 }
Index: include/asm-sh/siginfo.h
===================================================================
RCS file: /cvsroot/linuxsh/linux/include/asm-sh/siginfo.h,v
retrieving revision 1.2
diff -u -3 -p -r1.2 siginfo.h
--- include/asm-sh/siginfo.h	1 Mar 2002 01:55:10 -0000	1.2
+++ include/asm-sh/siginfo.h	22 Mar 2002 04:29:19 -0000
@@ -108,6 +108,7 @@ typedef struct siginfo {
 #define SI_ASYNCIO	-4		/* sent by AIO completion */
 #define SI_SIGIO	-5		/* sent by queued SIGIO */
 #define SI_TKILL	-6		/* sent by tkill system call */
+#define SI_DETHREAD	-7		/* sent by execve() killing subsidiary threads */
 
 #define SI_FROMUSER(siptr)	((siptr)->si_code <= 0)
 #define SI_FROMKERNEL(siptr)	((siptr)->si_code > 0)
Index: include/asm-sh/unistd.h
===================================================================
RCS file: /cvsroot/linuxsh/linux/include/asm-sh/unistd.h,v
retrieving revision 1.2
diff -u -3 -p -r1.2 unistd.h
--- include/asm-sh/unistd.h	26 Feb 2002 09:15:16 -0000	1.2
+++ include/asm-sh/unistd.h	22 Mar 2002 04:29:19 -0000
@@ -245,6 +245,8 @@
 #define __NR_removexattr	235
 #define __NR_lremovexattr	236
 #define __NR_fremovexattr	237
+#define __NR_tkill		238
+#define __NR_sendfile64		239
 
 /* user-visible error numbers are in the range -1 - -125: see <asm-sh/errno.h> */