From 0ceda395254d2758c58d03abe5649961136a4ae5 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Mon, 1 Sep 2008 18:16:52 +0200
Subject: [PATCH] --- yaml --- r: 116762 b: refs/heads/master c:
 9f3541ed2cc5e74a4ace7052701055dedbe46938 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/arch/ia64/ia32/ia32_entry.S    | 2 +-
 trunk/arch/ia64/ia32/sys_ia32.c      | 8 --------
 trunk/arch/ia64/include/asm/kregs.h  | 2 +-
 trunk/arch/ia64/include/asm/unistd.h | 1 +
 trunk/arch/ia64/mm/tlb.c             | 8 ++------
 6 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index 5b88fda612be..b967e642de7f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a9894a4a3c7fb53258d46dafe9dd4f45369fd9dd
+refs/heads/master: 9f3541ed2cc5e74a4ace7052701055dedbe46938
diff --git a/trunk/arch/ia64/ia32/ia32_entry.S b/trunk/arch/ia64/ia32/ia32_entry.S
index 53505bb04771..fa9844305610 100644
--- a/trunk/arch/ia64/ia32/ia32_entry.S
+++ b/trunk/arch/ia64/ia32/ia32_entry.S
@@ -202,7 +202,7 @@ ia32_syscall_table:
 	data8 sys32_ptrace
 	data8 sys32_alarm
 	data8 sys_ni_syscall
-	data8 sys32_pause
+	data8 sys_pause
 	data8 compat_sys_utime	  /* 30 */
 	data8 sys_ni_syscall	  /* old stty syscall holder */
 	data8 sys_ni_syscall	  /* old gtty syscall holder */
diff --git a/trunk/arch/ia64/ia32/sys_ia32.c b/trunk/arch/ia64/ia32/sys_ia32.c
index f4430bb4bbdc..0fd06b471bc1 100644
--- a/trunk/arch/ia64/ia32/sys_ia32.c
+++ b/trunk/arch/ia64/ia32/sys_ia32.c
@@ -1703,14 +1703,6 @@ sys32_sigaltstack (ia32_stack_t __user *uss32, ia32_stack_t __user *uoss32,
 	return ret;
 }
 
-asmlinkage int
-sys32_pause (void)
-{
-	current->state = TASK_INTERRUPTIBLE;
-	schedule();
-	return -ERESTARTNOHAND;
-}
-
 asmlinkage int
 sys32_msync (unsigned int start, unsigned int len, int flags)
 {
diff --git a/trunk/arch/ia64/include/asm/kregs.h b/trunk/arch/ia64/include/asm/kregs.h
index 39e65f6639f5..aefcdfee7f23 100644
--- a/trunk/arch/ia64/include/asm/kregs.h
+++ b/trunk/arch/ia64/include/asm/kregs.h
@@ -32,7 +32,7 @@
 #define IA64_TR_CURRENT_STACK	1	/* dtr1: maps kernel's memory- & register-stacks */
 
 #define IA64_TR_ALLOC_BASE	2 	/* itr&dtr: Base of dynamic TR resource*/
-#define IA64_TR_ALLOC_MAX	64 	/* Max number for dynamic use*/
+#define IA64_TR_ALLOC_MAX	32 	/* Max number for dynamic use*/
 
 /* Processor status register bits: */
 #define IA64_PSR_BE_BIT		1
diff --git a/trunk/arch/ia64/include/asm/unistd.h b/trunk/arch/ia64/include/asm/unistd.h
index d535833aab5e..f791576355ad 100644
--- a/trunk/arch/ia64/include/asm/unistd.h
+++ b/trunk/arch/ia64/include/asm/unistd.h
@@ -337,6 +337,7 @@
 # define __ARCH_WANT_SYS_NICE
 # define __ARCH_WANT_SYS_OLD_GETRLIMIT
 # define __ARCH_WANT_SYS_OLDUMOUNT
+# define __ARCH_WANT_SYS_PAUSE
 # define __ARCH_WANT_SYS_SIGPENDING
 # define __ARCH_WANT_SYS_SIGPROCMASK
 # define __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND
diff --git a/trunk/arch/ia64/mm/tlb.c b/trunk/arch/ia64/mm/tlb.c
index bd9818a36b47..8caf42471f0d 100644
--- a/trunk/arch/ia64/mm/tlb.c
+++ b/trunk/arch/ia64/mm/tlb.c
@@ -362,13 +362,9 @@ ia64_tlb_init (void)
 		per_cpu(ia64_tr_num, cpu) =
 				vm_info_1.pal_vm_info_1_s.max_dtr_entry+1;
 	if (per_cpu(ia64_tr_num, cpu) > IA64_TR_ALLOC_MAX) {
-		static int justonce = 1;
 		per_cpu(ia64_tr_num, cpu) = IA64_TR_ALLOC_MAX;
-		if (justonce) {
-			justonce = 0;
-			printk(KERN_DEBUG "TR register number exceeds "
-			       "IA64_TR_ALLOC_MAX!\n");
-		}
+		printk(KERN_DEBUG "TR register number exceeds IA64_TR_ALLOC_MAX!"
+			"IA64_TR_ALLOC_MAX should be extended\n");
 	}
 }