Merge master.kernel.org:/home/davem/BK/sparc-2.5

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux

arch/sparc/kernel/systbls.S

@@ -56,8 +56,8 @@ sys_call_table:
 /*175*/	.long sys_setsid, sys_fchdir, sys_fgetxattr, sys_listxattr, sys_llistxattr
 /*180*/	.long sys_flistxattr, sys_removexattr, sys_lremovexattr, sys_sigpending, sys_ni_syscall
 /*185*/	.long sys_setpgid, sys_fremovexattr, sys_tkill, sys_exit_group, sys_newuname
-/*190*/	.long sys_init_module, sys_personality, sparc_remap_file_pages, sys_nis_syscall, sys_nis_syscall
-/*195*/	.long sys_nis_syscall, sys_nis_syscall, sys_getppid, sparc_sigaction, sys_sgetmask
+/*190*/	.long sys_init_module, sys_personality, sparc_remap_file_pages, sys_epoll_create, sys_epoll_ctl
+/*195*/	.long sys_epoll_wait, sys_nis_syscall, sys_getppid, sparc_sigaction, sys_sgetmask
 /*200*/	.long sys_ssetmask, sys_sigsuspend, sys_newlstat, sys_uselib, old_readdir
 /*205*/	.long sys_readahead, sys_socketcall, sys_syslog, sys_lookup_dcookie, sys_nis_syscall
 /*210*/	.long sys_nis_syscall, sys_nis_syscall, sys_waitpid, sys_swapoff, sys_sysinfo

arch/sparc64/Makefile

@@ -33,7 +33,7 @@ AS		:= $(AS) -64
 LDFLAGS		:= -m elf64_sparc
 LDFLAGS_BLOB	:= --format binary --oformat elf64-sparc
 endif
-ELFTOAOUT	= elftoaout
+
 ifneq ($(UNDECLARED_REGS),y)
 CC_UNDECL	=
 else
@@ -63,13 +63,11 @@ core-$(CONFIG_SOLARIS_EMUL)	+= arch/sparc64/solaris/
 core-y				+= arch/sparc64/math-emu/
 libs-y				+= arch/sparc64/prom/ arch/sparc64/lib/
 
-vmlinux.aout: vmlinux
-	$(ELFTOAOUT) -o $(TOPDIR)/vmlinux.aout $(TOPDIR)/vmlinux
+makeboot =$(Q)$(MAKE) -f scripts/Makefile.build obj=arch/sparc64/boot $(1)
 
-archclean:
-	rm -f $(TOPDIR)/vmlinux.aout
+tftpboot.img vmlinux.aout:
+	$(call makeboot,arch/sparc64/boot/$@)
 
 archmrproper:
+archclean:
 
-tftpboot.img:
-	$(MAKE) -C arch/sparc64/boot tftpboot.img

arch/sparc64/boot/Makefile

@@ -4,17 +4,27 @@
 # Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
 # Copyright (C) 1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
 
-ROOT_IMG	=/usr/src/root.img
-ELFTOAOUT	=elftoaout
+ROOT_IMG	:= /usr/src/root.img
+ELFTOAOUT	:= elftoaout
 
-all: boot
+host-progs    := piggyback
+EXTRA_TARGETS := tftpboot.img vmlinux.aout
 
-boot:
-	@echo "Nothing special to be done for 'boot' on Linux/UltraSPARC."
+quiet_cmd_elftoaout = ELT2AOUT $@
+      cmd_elftoaout = $(ELFTOAOUT) vmlinux -o $@
+quiet_cmd_piggy     = PIGGY    $@
+      cmd_piggy     = $(obj)/piggyback $@ System.map $(ROOT_IMG)
 
-tftpboot.img: piggyback $(TOPDIR)/vmlinux $(ROOT_IMG)
-	$(ELFTOAOUT) $(TOPDIR)/vmlinux -o tftpboot.img
-	./piggyback tftpboot.img $(TOPDIR)/System.map $(ROOT_IMG)
+$(obj)/tftpboot.img: $(obj)/piggyback System.map vmlinux $(ROOT_IMG) FORCE
+	$(call if_changed,elftoaout)
+	$(call if_changed,piggy)
+	@echo '  kernel: $@ is ready'
 
-piggyback: piggyback.c
-	$(HOSTCC) $(HOSTCFLAGS) -o piggyback piggyback.c
+$(obj)/vmlinux.aout: vmlinux FORCE
+	$(call if_changed,elftoaout)
+	@echo '  kernel: $@ is ready'
+
+archhelp:
+	@echo  '* vmlinux       - Standard sparc64 kernel'
+	@echo  '  vmlinux.aout  - a.out kernel for sparc64'
+	@echo  '  tftpboot.img  - Image prepared for tftp'

arch/sparc64/kernel/Makefile

@@ -2,8 +2,6 @@
 # Makefile for the linux kernel.
 #
 
-SH = $(CONFIG_SHELL)
-
 EXTRA_AFLAGS := -ansi
 
 EXTRA_TARGETS	:= head.o init_task.o

arch/sparc64/kernel/systbls.S

@@ -57,8 +57,8 @@ sys_call_table32:
 	.word sys_setsid, sys_fchdir, sys_fgetxattr, sys_listxattr, sys_llistxattr
 /*180*/	.word sys_flistxattr, sys_removexattr, sys_lremovexattr, sys32_sigpending, sys_ni_syscall
 	.word sys_setpgid, sys_fremovexattr, sys_tkill, sys_exit_group, sparc64_newuname
-/*190*/	.word sys32_init_module, sparc64_personality, sys_remap_file_pages, sys_nis_syscall, sys_nis_syscall
-	.word sys_nis_syscall, sys_nis_syscall, sys_getppid, sys32_sigaction, sys_sgetmask
+/*190*/	.word sys32_init_module, sparc64_personality, sys_remap_file_pages, sys_epoll_create, sys_epoll_ctl
+	.word sys_epoll_wait, sys_nis_syscall, sys_getppid, sys32_sigaction, sys_sgetmask
 /*200*/	.word sys_ssetmask, sys_sigsuspend, sys32_newlstat, sys_uselib, old32_readdir
 	.word sys32_readahead, sys32_socketcall, sys_syslog, sys_lookup_dcookie, sys_nis_syscall
 /*210*/	.word sys_nis_syscall, sys_nis_syscall, sys_waitpid, sys_swapoff, sys32_sysinfo
@@ -116,8 +116,8 @@ sys_call_table:
 	.word sys_setsid, sys_fchdir, sys_fgetxattr, sys_listxattr, sys_llistxattr
 /*180*/	.word sys_flistxattr, sys_removexattr, sys_lremovexattr, sys_nis_syscall, sys_ni_syscall
 	.word sys_setpgid, sys_fremovexattr, sys_tkill, sys_exit_group, sparc64_newuname
-/*190*/	.word sys_init_module, sparc64_personality, sys_remap_file_pages, sys_nis_syscall, sys_nis_syscall
-	.word sys_nis_syscall, sys_nis_syscall, sys_getppid, sys_nis_syscall, sys_sgetmask
+/*190*/	.word sys_init_module, sparc64_personality, sys_remap_file_pages, sys_epoll_create, sys_epoll_ctl
+	.word sys_epoll_wait, sys_nis_syscall, sys_getppid, sys_nis_syscall, sys_sgetmask
 /*200*/	.word sys_ssetmask, sys_nis_syscall, sys_newlstat, sys_uselib, sys_nis_syscall
 	.word sys_readahead, sys_socketcall, sys_syslog, sys_lookup_dcookie, sys_nis_syscall
 /*210*/	.word sys_nis_syscall, sys_nis_syscall, sys_waitpid, sys_swapoff, sys_sysinfo

arch/sparc64/lib/Makefile

@@ -11,5 +11,3 @@ obj-y := PeeCeeI.o blockops.o debuglocks.o strlen.o strncmp.o \
 	 VIScsumcopyusr.o VISsave.o atomic.o rwlock.o bitops.o \
 	 dec_and_lock.o U3memcpy.o U3copy_from_user.o U3copy_to_user.o \
 	 U3copy_in_user.o mcount.o ipcsum.o
-
-include $(TOPDIR)/Rules.make

arch/sparc64/math-emu/Makefile

@@ -4,6 +4,4 @@
 
 obj-y    := math.o
 
-EXTRA_CFLAGS = -I. -I$(TOPDIR)/include/math-emu -w
-
-include $(TOPDIR)/Rules.make
+EXTRA_CFLAGS = -I. -Iinclude/math-emu -w

arch/sparc64/mm/Makefile

@@ -7,5 +7,3 @@ EXTRA_AFLAGS := -ansi
 obj-y    := ultra.o fault.o init.o generic.o extable.o
 
 obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
-
-include $(TOPDIR)/Rules.make

arch/sparc64/prom/Makefile

@@ -8,5 +8,3 @@ EXTRA_AFLAGS := -ansi
 L_TARGET = lib.a
 obj-y   := bootstr.o devops.o init.o memory.o misc.o \
 	   tree.o console.o printf.o p1275.o map.o
-
-include $(TOPDIR)/Rules.make

arch/sparc64/solaris/Makefile

@@ -8,5 +8,3 @@ solaris-objs := entry64.o fs.o misc.o signal.o systbl.o socket.o \
 		ioctl.o ipc.o socksys.o timod.o
 
 obj-$(CONFIG_SOLARIS_EMUL) += solaris.o
-
-include $(TOPDIR)/Rules.make

arch/sparc64/vmlinux.lds.S

@@ -24,6 +24,8 @@ SECTIONS
     CONSTRUCTORS
   }
   .data1   : { *(.data1) }
+  . = ALIGN(64);
+  .data.cacheline_aligned : { *(.data.cacheline_aligned) }
   _edata  =  .;
   PROVIDE (edata = .);
   .fixup   : { *(.fixup) }
@@ -70,8 +72,6 @@ SECTIONS
   __per_cpu_end = .;
   . = ALIGN(8192);
   __init_end = .;
-  . = ALIGN(64);
-  .data.cacheline_aligned : { *(.data.cacheline_aligned) }
   __bss_start = .;
   .sbss      : { *(.sbss) *(.scommon) }
   .bss       :

include/asm-sparc/system.h

@@ -123,7 +123,7 @@ extern void fpsave(unsigned long *fpregs, unsigned long *fsr,
 	"save %sp, -0x40, %sp\n\t" \
 	"restore; restore; restore; restore; restore; restore; restore"); \
 } while(0)
-#define finish_arch_switch(rq, next)	do{ }while(0)
+#define finish_arch_switch(rq, next)	spin_unlock_irq(&(rq)->lock)
 #define task_running(rq, p)		((rq)->curr == (p))
 
 	/* Much care has gone into this code, do not touch it.
@@ -195,21 +195,6 @@ extern __inline__ void setipl(unsigned long __orig_psr)
 		: "memory", "cc");
 }
 
-extern __inline__ void local_irq_disable(void)
-{
-	unsigned long tmp;
-
-	__asm__ __volatile__(
-		"rd	%%psr, %0\n\t"
-		"nop; nop; nop;\n\t"	/* Sun4m + Cypress + SMP bug */
-		"or	%0, %1, %0\n\t"
-		"wr	%0, 0x0, %%psr\n\t"
-		"nop; nop; nop\n"
-		: "=r" (tmp)
-		: "i" (PSR_PIL)
-		: "memory");
-}
-
 extern __inline__ void local_irq_enable(void)
 {
 	unsigned long tmp;
@@ -233,6 +218,7 @@ extern __inline__ unsigned long getipl(void)
 	return retval;
 }
 
+#if 0 /* not used */
 extern __inline__ unsigned long swap_pil(unsigned long __new_psr)
 {
 	unsigned long retval;
@@ -254,6 +240,7 @@ extern __inline__ unsigned long swap_pil(unsigned long __new_psr)
 
 	return retval;
 }
+#endif
 
 extern __inline__ unsigned long read_psr_and_cli(void)
 {
@@ -275,15 +262,9 @@ extern __inline__ unsigned long read_psr_and_cli(void)
 #define local_save_flags(flags)	((flags) = getipl())
 #define local_irq_save(flags)	((flags) = read_psr_and_cli())
 #define local_irq_restore(flags)	setipl((flags))
+#define local_irq_disable()	((void) read_psr_and_cli())
 
-/* On sparc32 IRQ flags are the PSR register in the PSR_PIL
- * field.
- */
-#define irqs_disabled()		\
-({	unsigned long flags;	\
-	local_save_flags(flags);\
-	(flags & PSR_PIL) != 0;	\
-})
+#define irqs_disabled()		((getipl() & PSR_PIL) != 0)
 
 #ifdef CONFIG_SMP
 

include/asm-sparc/unistd.h

@@ -208,9 +208,9 @@
 #define __NR_init_module        190 /* Linux Specific                              */
 #define __NR_personality        191 /* Linux Specific                              */
 #define __NR_remap_file_pages   192 /* Linux Specific                              */
-/* #define __NR_break           193    Linux Specific                              */
-/* #define __NR_lock            194    Linux Specific                              */
-/* #define __NR_mpx             195    Linux Specific                              */
+#define __NR_epoll_create       193 /* Linux Specific                              */
+#define __NR_epoll_ctl          194 /* Linux Specific                              */
+#define __NR_epoll_wait         195 /* Linux Specific                              */
 /* #define __NR_ulimit          196    Linux Specific                              */
 #define __NR_getppid            197 /* Linux Specific                              */
 #define __NR_sigaction          198 /* Linux Specific                              */

include/asm-sparc64/unistd.h

@@ -208,9 +208,9 @@
 #define __NR_init_module        190 /* Linux Specific                              */
 #define __NR_personality        191 /* Linux Specific                              */
 #define __NR_remap_file_pages   192 /* Linux Specific                              */
-/* #define __NR_break           193    Linux Specific                              */
-/* #define __NR_lock            194    Linux Specific                              */
-/* #define __NR_mpx             195    Linux Specific                              */
+#define __NR_epoll_create       193 /* Linux Specific                              */
+#define __NR_epoll_ctl          194 /* Linux Specific                              */
+#define __NR_epoll_wait         195 /* Linux Specific                              */
 /* #define __NR_ulimit          196    Linux Specific                              */
 #define __NR_getppid            197 /* Linux Specific                              */
 #define __NR_sigaction          198 /* Linux Specific                              */