From 72f105c41e2fae41eac5bb3734ef17b92386a47c Mon Sep 17 00:00:00 2001
From: Paul Mackerras <paulus@samba.org>
Date: Mon, 12 May 2008 14:20:35 +1000
Subject: [PATCH] --- yaml --- r: 96401 b: refs/heads/master c:
 516c8be3a93ec2b0746ba0907f38c1d1e62f4992 h: refs/heads/master i:   96399:
 6ec03868f1a8f250c8426d092ca5e4f799563fc2 v: v3

---
 [refs]                               |  2 +-
 trunk/arch/powerpc/kernel/cputable.c |  2 ++
 trunk/arch/sparc/kernel/rtrap.S      |  2 +-
 trunk/arch/sparc64/mm/init.c         | 16 +++++-----------
 trunk/drivers/net/wireless/strip.c   |  2 +-
 trunk/drivers/serial/crisv10.c       |  2 +-
 trunk/include/asm-sparc/ptrace.h     |  2 --
 7 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index 8fd2ffef1f0c..22757e84d089 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 59b1c82500bb5d658891bc8e8a2308b76d58a4de
+refs/heads/master: 516c8be3a93ec2b0746ba0907f38c1d1e62f4992
diff --git a/trunk/arch/powerpc/kernel/cputable.c b/trunk/arch/powerpc/kernel/cputable.c
index 81738a4b3c3a..e44d5530f0a6 100644
--- a/trunk/arch/powerpc/kernel/cputable.c
+++ b/trunk/arch/powerpc/kernel/cputable.c
@@ -1484,6 +1484,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
 		.dcache_bsize		= 32,
 		.machine_check		= machine_check_e200,
 		.platform		= "ppc5554",
+	}
 #endif /* CONFIG_E200 */
 #ifdef CONFIG_E500
 	{	/* e500 */
@@ -1533,6 +1534,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
 		.dcache_bsize		= 32,
 		.machine_check		= machine_check_e500,
 		.platform		= "powerpc",
+	}
 #endif /* CONFIG_E500 */
 #endif /* CONFIG_PPC32 */
 };
diff --git a/trunk/arch/sparc/kernel/rtrap.S b/trunk/arch/sparc/kernel/rtrap.S
index ab818cdc4cc0..b27b5b56f77a 100644
--- a/trunk/arch/sparc/kernel/rtrap.S
+++ b/trunk/arch/sparc/kernel/rtrap.S
@@ -139,7 +139,7 @@ ret_trap_userwins_ok:
 	LOAD_PT_PRIV(sp, t_psr, t_pc, t_npc)
 	or	%t_pc, %t_npc, %g2
 	andcc	%g2, 0x3, %g0
-	sethi	%hi(PSR_SYSCALL), %g2
+	sethi	%hi(PSR_SYCALL), %g2
 	be	1f
 	 andn	%t_psr, %g2, %t_psr
 
diff --git a/trunk/arch/sparc64/mm/init.c b/trunk/arch/sparc64/mm/init.c
index a9828d748e2c..ec3e2c72302a 100644
--- a/trunk/arch/sparc64/mm/init.c
+++ b/trunk/arch/sparc64/mm/init.c
@@ -610,6 +610,8 @@ static void __init remap_kernel(void)
 
 static void __init inherit_prom_mappings(void)
 {
+	read_obp_translations();
+
 	/* Now fixup OBP's idea about where we really are mapped. */
 	printk("Remapping the kernel... ");
 	remap_kernel();
@@ -1745,17 +1747,7 @@ void __init paging_init(void)
 
 	lmb_init();
 
-	/* Find available physical memory...
-	 *
-	 * Read it twice in order to work around a bug in openfirmware.
-	 * The call to grab this table itself can cause openfirmware to
-	 * allocate memory, which in turn can take away some space from
-	 * the list of available memory.  Reading it twice makes sure
-	 * we really do get the final value.
-	 */
-	read_obp_translations();
-	read_obp_memory("reg", &pall[0], &pall_ents);
-	read_obp_memory("available", &pavail[0], &pavail_ents);
+	/* Find available physical memory... */
 	read_obp_memory("available", &pavail[0], &pavail_ents);
 
 	phys_base = 0xffffffffffffffffUL;
@@ -1796,6 +1788,8 @@ void __init paging_init(void)
 	
 	inherit_prom_mappings();
 	
+	read_obp_memory("reg", &pall[0], &pall_ents);
+
 	init_kpte_bitmap();
 
 	/* Ok, we can use our TLB miss and window trap handlers safely.  */
diff --git a/trunk/drivers/net/wireless/strip.c b/trunk/drivers/net/wireless/strip.c
index 883af891ebfb..5dd23c93497d 100644
--- a/trunk/drivers/net/wireless/strip.c
+++ b/trunk/drivers/net/wireless/strip.c
@@ -2611,7 +2611,7 @@ static int strip_open(struct tty_struct *tty)
 	 * We need a write method.
 	 */
 
-	if (tty->ops->write == NULL || tty->ops->set_termios == NULL)
+	if (tty->ops->write == NULL)
 		return -EOPNOTSUPP;
 
 	/*
diff --git a/trunk/drivers/serial/crisv10.c b/trunk/drivers/serial/crisv10.c
index 3e0366eab412..f9fa237aa949 100644
--- a/trunk/drivers/serial/crisv10.c
+++ b/trunk/drivers/serial/crisv10.c
@@ -3808,7 +3808,7 @@ rs_close(struct tty_struct *tty, struct file * filp)
 
 	shutdown(info);
 	rs_flush_buffer(tty);
-	tty_ldisc_flush(tty);
+	tty_ldisc_flush_buffer(tty);
 	tty->closing = 0;
 	info->event = 0;
 	info->tty = 0;
diff --git a/trunk/include/asm-sparc/ptrace.h b/trunk/include/asm-sparc/ptrace.h
index 0afb867d6c1b..6b5e6ce5043c 100644
--- a/trunk/include/asm-sparc/ptrace.h
+++ b/trunk/include/asm-sparc/ptrace.h
@@ -10,8 +10,6 @@
 
 #ifndef __ASSEMBLY__
 
-#include <linux/types.h>
-
 struct pt_regs {
 	unsigned long psr;
 	unsigned long pc;