Merge davem@nuts.ninka.net:/home/davem/src/BK/sparc-2.5

into kernel.bkbits.net:/home/davem/sparc-2.5

6 files changed, 21 insertions, 14 deletions

diff --git a/include/asm-alpha/core_cia.h b/include/asm-alpha/core_cia.h
index 827f9bbf0d3c..7898b037f73f 100644
--- a/include/asm-alpha/core_cia.h
+++ b/include/asm-alpha/core_cia.h
@@ -202,6 +202,10 @@
 #define CIA_IOC_PCI_W3_MASK		(IDENT_ADDR + 0x8760000740UL)
 #define CIA_IOC_PCI_T3_BASE		(IDENT_ADDR + 0x8760000780UL)
 
+#define CIA_IOC_PCI_Wn_BASE(N)	(IDENT_ADDR + 0x8760000400UL + (N)*0x100) 
+#define CIA_IOC_PCI_Wn_MASK(N)	(IDENT_ADDR + 0x8760000440UL + (N)*0x100) 
+#define CIA_IOC_PCI_Tn_BASE(N)	(IDENT_ADDR + 0x8760000480UL + (N)*0x100) 
+
 #define CIA_IOC_PCI_W_DAC		(IDENT_ADDR + 0x87600007C0UL)
 
 /*
diff --git a/include/asm-alpha/current.h b/include/asm-alpha/current.h
index dccab45e2c9e..8d88a13c1bec 100644
--- a/include/asm-alpha/current.h
+++ b/include/asm-alpha/current.h
@@ -1,7 +1,7 @@
 #ifndef _ALPHA_CURRENT_H
 #define _ALPHA_CURRENT_H
 
-#include <asm/thread_info.h>
+#include <linux/thread_info.h>
 
 #define get_current()	(current_thread_info()->task + 0)
 #define current		get_current()
diff --git a/include/asm-alpha/pci.h b/include/asm-alpha/pci.h
index ae1e9c9a2c44..60af31abecd6 100644
--- a/include/asm-alpha/pci.h
+++ b/include/asm-alpha/pci.h
@@ -6,6 +6,8 @@
 #include <linux/spinlock.h>
 #include <asm/scatterlist.h>
 #include <asm/machvec.h>
+#include <asm/io.h>
+
 
 /*
  * The following structure is used to manage multiple PCI busses.
diff --git a/include/asm-alpha/thread_info.h b/include/asm-alpha/thread_info.h
index 2702e1ccd89d..40d1416a7037 100644
--- a/include/asm-alpha/thread_info.h
+++ b/include/asm-alpha/thread_info.h
@@ -25,6 +25,8 @@ struct thread_info {
 	int bpt_nsaved;
 	unsigned long bpt_addr[2];		/* breakpoint handling  */
 	unsigned int bpt_insn[2];
+
+	struct restart_block	restart_block;
 };
 
 /*
@@ -35,6 +37,9 @@ struct thread_info {
 	task:		&tsk,			\
 	exec_domain:	&default_exec_domain,	\
 	addr_limit:	KERNEL_DS,		\
+	.restart_block = {			\
+		.fn = do_no_restart_syscall,	\
+	},					\
 }
 
 #define init_thread_info	(init_thread_union.thread_info)
diff --git a/include/asm-alpha/topology.h b/include/asm-alpha/topology.h
index f3c6cd7ae491..e80327049f70 100644
--- a/include/asm-alpha/topology.h
+++ b/include/asm-alpha/topology.h
@@ -1,20 +1,15 @@
 #ifndef _ASM_ALPHA_TOPOLOGY_H
 #define _ASM_ALPHA_TOPOLOGY_H
 
-#ifdef CONFIG_NUMA
-#ifdef CONFIG_ALPHA_WILDFIRE
+#if defined(CONFIG_NUMA) && defined(CONFIG_ALPHA_WILDFIRE)
+
 /* With wildfire assume 4 CPUs per node */
 #define __cpu_to_node(cpu)		((cpu) >> 2)
-#endif /* CONFIG_ALPHA_WILDFIRE */
-#endif /* CONFIG_NUMA */
 
-#if !defined(CONFIG_NUMA) || !defined(CONFIG_ALPHA_WILDFIRE)
-#define __cpu_to_node(cpu)		(0)
-#define __memblk_to_node(memblk)	(0)
-#define __parent_node(nid)		(0)
-#define __node_to_first_cpu(node)	(0)
-#define __node_to_cpu_mask(node)	(cpu_online_map)
-#define __node_to_memblk(node)		(0)
-#endif /* !CONFIG_NUMA || !CONFIG_ALPHA_WILDFIRE */
+#else /* !CONFIG_NUMA || !CONFIG_ALPHA_WILDFIRE */
+
+#include <asm-generic/topology.h>
+
+#endif /* CONFIG_NUMA && CONFIG_ALPHA_WILDFIRE */
 
 #endif /* _ASM_ALPHA_TOPOLOGY_H */
diff --git a/include/asm-alpha/unistd.h b/include/asm-alpha/unistd.h
index 36585f474abe..da926dbabc93 100644
--- a/include/asm-alpha/unistd.h
+++ b/include/asm-alpha/unistd.h
@@ -349,7 +349,8 @@
 #define __NR_sys_epoll_wait		409
 #define __NR_remap_file_pages		410
 #define __NR_set_tid_address		411
-#define NR_SYSCALLS			412
+#define __NR_restart_syscall		412
+#define NR_SYSCALLS			413
 
 #if defined(__GNUC__)