Some minor build and compilation fixes to the copy_sc merge.

arch/um/kernel/signal_kern.c

@@ -252,7 +252,7 @@ int sys_sigreturn(struct pt_regs regs)
 	sigdelsetmask(&current->blocked, ~_BLOCKABLE);
 	recalc_sigpending();
 	spin_unlock_irq(&current->sig->siglock);
-	copy_sc_from_user(current->thread.regs, sc);
+	copy_sc_from_user(&current->thread.regs, sc);
 	return(PT_REGS_SYSCALL_RET(&current->thread.regs));
 }
 
@@ -267,7 +267,7 @@ int sys_rt_sigreturn(struct pt_regs regs)
 	sigdelsetmask(&current->blocked, ~_BLOCKABLE);
 	recalc_sigpending();
 	spin_unlock_irq(&current->sig->siglock);
-	copy_sc_from_user(current->thread.regs, sc);
+	copy_sc_from_user(&current->thread.regs, sc);
 	return(PT_REGS_SYSCALL_RET(&current->thread.regs));
 }
 

arch/um/kernel/skas/Makefile

@@ -3,10 +3,8 @@
 # Licensed under the GPL
 #
 
-subdir-y = sys-$(SUBARCH)/
-
 obj-y = exec_kern.o exec_user.o mem_user.o mmu.o process.o process_kern.o \
-	syscall_user.o trap_user.o $(subdir-y)
+	syscall_user.o trap_user.o sys-$(SUBARCH)/
 
 USER_OBJS = $(filter %_user.o,$(obj-y)) process.o time.o
 USER_OBJS := $(foreach file,$(USER_OBJS),$(obj)/$(file))

arch/um/kernel/skas/sys-i386/Makefile

@@ -3,15 +3,14 @@
 # Licensed under the GPL
 #
 
-O_TARGET = sys-i386.o
-
 obj-y = sigcontext.o
 
 USER_OBJS = sigcontext.o
+USER_OBJS := $(foreach file,$(USER_OBJS),$(obj)/$(file))
 
 include $(TOPDIR)/Rules.make
 
 $(USER_OBJS) : %.o: %.c
-	$(CC) $(CFLAGS_$@) $(USER_CFLAGS) -c -o $@ $<
+	$(CC) $(CFLAGS_$(notdir $@)) $(USER_CFLAGS) -c -o $@ $<
 
 clean :

arch/um/kernel/tt/Makefile

@@ -3,13 +3,10 @@
 # Licensed under the GPL
 #
 
-subdir-y = sys-$(SUBARCH)/
-
-subdir-$(CONFIG_PT_PROXY) += ptproxy/
-
 obj-y = exec_kern.o exec_user.o gdb.o gdb_kern.o mem.o process_kern.o \
-	syscall_user.o tracer.o uaccess_user.o $(subdir-y)
+	syscall_user.o tracer.o uaccess_user.o sys-$(SUBARCH)/
 
+obj-$(CONFIG_PT_PROXY) += ptproxy/
 
 USER_OBJS := $(filter %_user.o,$(obj-y)) gdb.o tracer.o
 USER_OBJS := $(foreach file,$(USER_OBJS),$(obj)/$(file))

arch/um/kernel/tt/sys-i386/Makefile

@@ -3,15 +3,14 @@
 # Licensed under the GPL
 #
 
-O_TARGET = sys-i386.o
-
 obj-y = sigcontext.o
 
 USER_OBJS = sigcontext.o
+USER_OBJS := $(foreach file,$(USER_OBJS),$(obj)/$(file))
 
 include $(TOPDIR)/Rules.make
 
 $(USER_OBJS) : %.o: %.c
-	$(CC) $(CFLAGS_$@) $(USER_CFLAGS) -c -o $@ $<
+	$(CC) $(CFLAGS_$(notdir $@)) $(USER_CFLAGS) -c -o $@ $<
 
 clean :