Merge bk://linux.bkbits.net/linux-2.5

into maxwell.earthlink.net:/usr/src/linus-2.5

arch/alpha/Config.help

@@ -251,6 +251,10 @@ CONFIG_ALPHA_PRIMO
 CONFIG_ALPHA_GAMMA
   Say Y if you have an AS 2000 5/xxx or an AS 2100 5/xxx.
 
+CONFIG_ALPHA_EV67
+  Is this a machine based on the EV67 core?  If in doubt, select N here
+  and the machine will be treated as an EV6.
+
 CONFIG_ALPHA_SRM
   There are two different types of booting firmware on Alphas: SRM,
   which is command line driven, and ARC, which uses menus and arrow
@@ -610,3 +614,14 @@ CONFIG_DEBUG_SPINLOCK
   best used in conjunction with the NMI watchdog so that spinlock
   deadlocks are also debuggable.
 
+CONFIG_DEBUG_RWLOCK
+  If you say Y here then read-write lock processing will count how many
+  times it has tried to get the lock and issue an error message after
+  too many attempts.  If you suspect a rwlock problem or a kernel
+  hacker asks for this option then say Y.  Otherwise say N.
+
+CONFIG_DEBUG_SEMAPHORE
+  If you say Y here then semaphore processing will issue lots of
+  verbose debugging messages.  If you suspect a semaphore problem or a
+  kernel hacker asks for this option then say Y.  Otherwise say N.
+

arch/alpha/Makefile

@@ -99,30 +99,32 @@ export libs-y
 
 MAKEBOOT = $(MAKE) -C arch/alpha/boot
 
-rawboot:
+rawboot:	vmlinux
 	@$(MAKEBOOT) rawboot
 
+boot:	vmlinux
+	@$(MAKEBOOT)
+
 #
 # My boot writes directly to a specific disk partition, I doubt most
 # people will want to do that without changes..
 #
-msb my-special-boot:
+msb my-special-boot:	vmlinux
 	@$(MAKEBOOT) msb
 
-bootimage:
+bootimage:	vmlinux
 	@$(MAKEBOOT) bootimage
 
-srmboot:
+srmboot:	vmlinux
 	@$(MAKEBOOT) srmboot
 
 archclean:
-	@$(MAKE) -C arch/alpha/kernel clean
 	@$(MAKEBOOT) clean
 
 archmrproper:
 	rm -f include/asm-alpha/asm_offsets.h
 
-bootpfile:
+bootpfile:	vmlinux
 	@$(MAKEBOOT) bootpfile
 
 

arch/alpha/boot/Makefile

@@ -8,7 +8,9 @@
 # Copyright (C) 1994 by Linus Torvalds
 #
 
-LINKFLAGS = -static -T bootloader.lds #-N -relax
+LINKFLAGS = -static -T bootloader.lds -uvsprintf #-N -relax
+
+CFLAGS := $(CFLAGS) -I$(TOPDIR)/include
 
 .S.s:
 	$(CPP) $(AFLAGS) -traditional -o $*.o $<

arch/alpha/kernel/Makefile

@@ -8,8 +8,9 @@ EXTRA_AFLAGS	:= $(CFLAGS)
 
 export-objs := alpha_ksyms.o
 
-obj-y    := entry.o traps.o process.o init_task.o osf_sys.o irq.o irq_alpha.o \
-	    signal.o setup.o ptrace.o time.o semaphore.o alpha_ksyms.o
+obj-y    := entry.o traps.o process.o init_task.o osf_sys.o irq.o \
+	    irq_alpha.o signal.o setup.o ptrace.o time.o semaphore.o \
+	    alpha_ksyms.o systbls.o
 
 #
 # FIXME!

arch/alpha/kernel/alpha_ksyms.c

@@ -161,7 +161,6 @@ EXPORT_SYMBOL(sys_read);
 EXPORT_SYMBOL(sys_lseek);
 EXPORT_SYMBOL(__kernel_execve);
 EXPORT_SYMBOL(sys_setsid);
-EXPORT_SYMBOL(sys_sync);
 EXPORT_SYMBOL(sys_wait4);
 
 /* Networking helper routines. */

arch/alpha/kernel/process.c

@@ -191,26 +191,13 @@ machine_power_off(void)
 	common_shutdown(LINUX_REBOOT_CMD_POWER_OFF, NULL);
 }
 
+/* Used by sysrq-p, among others.  I don't believe r9-r15 are ever
+   saved in the context it's used.  */
+
 void
-show_regs(struct pt_regs * regs)
+show_regs(struct pt_regs *regs)
 {
-	printk("\n");
-	printk("Pid: %d, comm: %20s\n", current->pid, current->comm);
-	printk("ps: %04lx pc: [<%016lx>] CPU %d    %s\n",
-	       regs->ps, regs->pc, smp_processor_id(), print_tainted());
-	printk("rp: [<%016lx>] sp: %p\n", regs->r26, regs+1);
-	printk(" r0: %016lx  r1: %016lx  r2: %016lx  r3: %016lx\n",
-	       regs->r0, regs->r1, regs->r2, regs->r3);
-	printk(" r4: %016lx  r5: %016lx  r6: %016lx  r7: %016lx\n",
-	       regs->r4, regs->r5, regs->r6, regs->r7);
-	printk(" r8: %016lx r16: %016lx r17: %016lx r18: %016lx\n",
-	       regs->r8, regs->r16, regs->r17, regs->r18);
-	printk("r19: %016lx r20: %016lx r21: %016lx r22: %016lx\n",
-	       regs->r19, regs->r20, regs->r21, regs->r22);
-	printk("r23: %016lx r24: %016lx r25: %016lx r26: %016lx\n",
-	       regs->r23, regs->r24, regs->r25, regs->r26);
-	printk("r27: %016lx r28: %016lx r29: %016lx hae: %016lx\n",
-	       regs->r27, regs->r28, regs->gp, regs->hae);
+	dik_show_regs(regs, 0);
 }
 
 /*

arch/alpha/kernel/setup.c

@@ -37,6 +37,11 @@
 #include <linux/blk.h>
 #endif
 
+#ifdef CONFIG_MAGIC_SYSRQ
+#include <linux/sysrq.h>
+#include <linux/reboot.h>
+#endif
+
 #include <linux/notifier.h>
 extern struct notifier_block *panic_notifier_list;
 static int alpha_panic_event(struct notifier_block *, unsigned long, void *);
@@ -539,6 +544,15 @@ setup_arch(char **cmdline_p)
 		register_srm_console();
 	}
 
+#ifdef CONFIG_MAGIC_SYSRQ
+	/* If we're using SRM, make sysrq-b halt back to the prom,
+	   not auto-reboot.  */
+	if (alpha_using_srm) {
+		struct sysrq_key_op *op = __sysrq_get_key_op('b');
+		op->handler = (void *) machine_halt;
+	}
+#endif
+
 	/*
 	 * Indentify and reconfigure for the current system.
 	 */

arch/alpha/lib/Makefile

@@ -51,14 +51,16 @@ obj-$(CONFIG_SMP) += dec_and_lock.o
 
 include $(TOPDIR)/Rules.make
 
-__divqu.o: $(ev6)divide.S
-	$(CC) $(AFLAGS) -DDIV -c -o __divqu.o $(ev6)divide.S
+$(obj)/__divqu.o: $(obj)/$(ev6)divide.S
+	$(CC) $(AFLAGS) -DDIV -c -o $(obj)/__divqu.o $(obj)/$(ev6)divide.S
 
-__remqu.o: $(ev6)divide.S
-	$(CC) $(AFLAGS) -DREM -c -o __remqu.o $(ev6)divide.S
+$(obj)/__remqu.o: $(obj)/$(ev6)divide.S
+	$(CC) $(AFLAGS) -DREM -c -o $(obj)/__remqu.o $(obj)/$(ev6)divide.S
 
-__divlu.o: $(ev6)divide.S
-	$(CC) $(AFLAGS) -DDIV -DINTSIZE -c -o __divlu.o $(ev6)divide.S
+$(obj)/__divlu.o: $(obj)/$(ev6)divide.S
+	$(CC) $(AFLAGS) -DDIV -DINTSIZE \
+		-c -o $(obj)/__divlu.o $(obj)/$(ev6)divide.S
 
-__remlu.o: $(ev6)divide.S
-	$(CC) $(AFLAGS) -DREM -DINTSIZE -c -o __remlu.o $(ev6)divide.S
+$(obj)/__remlu.o: $(obj)/$(ev6)divide.S
+	$(CC) $(AFLAGS) -DREM -DINTSIZE \
+		-c -o $(obj)/__remlu.o $(obj)/$(ev6)divide.S

arch/alpha/lib/stxncpy.S

@@ -278,7 +278,7 @@ $u_eoc:
 	extqh	t2, a1, t0	# e0    : extract low bits for last word
 	or	t1, t0, t1	# e1    :
 
-1:	cmpbge	zero, t1, t7
+1:	cmpbge	zero, t1, t8
 	mov	t1, t0
 
 $u_eocfin:			# end-of-count, final word

arch/alpha/mm/fault.c

@@ -125,11 +125,10 @@ do_page_fault(unsigned long address, unsigned long mmcsr,
 		goto bad_area;
 	if (expand_stack(vma, address))
 		goto bad_area;
-/*
- * Ok, we have a good vm_area for this memory access, so
- * we can handle it..
- */
-good_area:
+
+	/* Ok, we have a good vm_area for this memory access, so
+	   we can handle it.  */
+ good_area:
 	if (cause < 0) {
 		if (!(vma->vm_flags & VM_EXEC))
 			goto bad_area;
@@ -143,11 +142,9 @@ do_page_fault(unsigned long address, unsigned long mmcsr,
 	}
 
  survive:
-	/*
-	 * If for any reason at all we couldn't handle the fault,
-	 * make sure we exit gracefully rather than endlessly redo
-	 * the fault.
-	 */
+	/* If for any reason at all we couldn't handle the fault,
+	   make sure we exit gracefully rather than endlessly redo
+	   the fault.  */
 	fault = handle_mm_fault(mm, vma, address, cause > 0);
 	up_read(&mm->mmap_sem);
 
@@ -155,14 +152,11 @@ do_page_fault(unsigned long address, unsigned long mmcsr,
 		goto out_of_memory;
 	if (fault == 0)
 		goto do_sigbus;
-
 	return;
 
-/*
- * Something tried to access memory that isn't in our memory map..
- * Fix it, but check if it's kernel or user first..
- */
-bad_area:
+	/* Something tried to access memory that isn't in our memory map.
+	   Fix it, but check if it's kernel or user first.  */
+ bad_area:
 	up_read(&mm->mmap_sem);
 
 	if (user_mode(regs)) {
@@ -170,7 +164,7 @@ do_page_fault(unsigned long address, unsigned long mmcsr,
 		return;
 	}
 
-no_context:
+ no_context:
 	/* Are we prepared to handle this fault as an exception?  */
 	if ((fixup = search_exception_table(regs->pc, regs->gp)) != 0) {
 		unsigned long newpc;
@@ -183,20 +177,16 @@ do_page_fault(unsigned long address, unsigned long mmcsr,
 		return;
 	}
 
-/*
- * Oops. The kernel tried to access some bad page. We'll have to
- * terminate things with extreme prejudice.
- */
+	/* Oops. The kernel tried to access some bad page. We'll have to
+	   terminate things with extreme prejudice.  */
 	printk(KERN_ALERT "Unable to handle kernel paging request at "
 	       "virtual address %016lx\n", address);
 	die_if_kernel("Oops", regs, cause, (unsigned long*)regs - 16);
 	do_exit(SIGKILL);
 
-/*
- * We ran out of memory, or some other thing happened to us that made
- * us unable to handle the page fault gracefully.
- */
-out_of_memory:
+	/* We ran out of memory, or some other thing happened to us that
+	   made us unable to handle the page fault gracefully.  */
+ out_of_memory:
 	if (current->pid == 1) {
 		yield();
 		down_read(&mm->mmap_sem);
@@ -208,18 +198,16 @@ do_page_fault(unsigned long address, unsigned long mmcsr,
 		goto no_context;
 	do_exit(SIGKILL);
 
-do_sigbus:
-	/*
-	 * Send a sigbus, regardless of whether we were in kernel
-	 * or user mode.
-	 */
+ do_sigbus:
+	/* Send a sigbus, regardless of whether we were in kernel
+	   or user mode.  */
 	force_sig(SIGBUS, current);
 	if (!user_mode(regs))
 		goto no_context;
 	return;
 
 #ifdef CONFIG_ALPHA_LARGE_VMALLOC
-vmalloc_fault:
+ vmalloc_fault:
 	if (user_mode(regs)) {
 		force_sig(SIGSEGV, current);
 		return;

arch/alpha/vmlinux.lds.S

@@ -58,10 +58,11 @@ SECTIONS
 	__initcall_end = .;
   }
 
-  . = ALIGN(64);
-  __per_cpu_start = .;
-  .data.percpu  : { *(.data.percpu) }
-  __per_cpu_end = .;
+  .data.percpu ALIGN(64): {
+	__per_cpu_start = .;
+	*(.data.percpu)
+	__per_cpu_end = .;
+  }
 
   /* The initial task and kernel stack */
   .data.init_thread ALIGN(2*8192) : {

include/asm-alpha/pal.h

@@ -45,7 +45,7 @@
 #define PAL_wrperfmon	57
 #define PAL_rdusp	58
 #define PAL_whami	60
-#define PAL_rtsys	61
+#define PAL_retsys	61
 #define PAL_rti		63
 
 #endif /* __ALPHA_PAL_H */

include/asm-alpha/unistd.h

@@ -331,19 +331,19 @@
 #define __NR_removexattr		391
 #define __NR_lremovexattr		392
 #define __NR_fremovexattr		393
-#define __NR_futex		394
-#define __NR_sched_setaffinity	395     
-#define __NR_sched_getaffinity	396
-#define __NR_tuxcall		397
-#define __NR_io_setup		398
-#define __NR_io_destroy		399
-#define __NR_io_getevents	400
-#define __NR_io_submit		401
-#define __NR_io_cancel		402
-#define __NR_alloc_hugepages	403
-#define __NR_free_hugepages	404
-#define __NR_exit_group		405
-
+#define __NR_futex			394
+#define __NR_sched_setaffinity		395     
+#define __NR_sched_getaffinity		396
+#define __NR_tuxcall			397
+#define __NR_io_setup			398
+#define __NR_io_destroy			399
+#define __NR_io_getevents		400
+#define __NR_io_submit			401
+#define __NR_io_cancel			402
+#define __NR_alloc_hugepages		403
+#define __NR_free_hugepages		404
+#define __NR_exit_group			405
+#define NR_SYSCALLS			406
 
 #if defined(__GNUC__)
 
@@ -598,7 +598,7 @@ static inline pid_t waitpid(int pid, int * wait_stat, int flags)
 	return sys_wait4(pid, wait_stat, flags, NULL);
 }
 
-#endif
+#endif /* __KERNEL_SYSCALLS__ */
 
 /*
  * "Conditional" syscalls

include/asm-generic/siginfo.h

@@ -91,7 +91,7 @@ typedef struct siginfo {
 #define __SI_FAULT	(3 << 16)
 #define __SI_CHLD	(4 << 16)
 #define __SI_RT		(5 << 16)
-#define __SI_CODE(T,N)	((T) << 16 | ((N) & 0xffff))
+#define __SI_CODE(T,N)	((T) | ((N) & 0xffff))
 #else
 #define __SI_KILL	0
 #define __SI_TIMER	0