Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Documentation/arm/README

@@ -163,9 +163,9 @@ CONFIG_MACH_ and CONFIG_ARCH_
 
     <http://www.arm.linux.org.uk/developer/machines/>
 
-Kernel entry (head-armv.S)
+Kernel entry (head.S)
 --------------------------
-  The initial entry into the kernel is via head-armv.S, which uses machine
+  The initial entry into the kernel is via head.S, which uses machine
   independent code.  The machine is selected by the value of 'r1' on
   entry, which must be kept unique.
 

arch/arm/kernel/head.S

 /*
- *  linux/arch/arm/kernel/head-armv.S
+ *  linux/arch/arm/kernel/head.S
  *
  *  Copyright (C) 1994-2002 Russell King
  *

arch/arm/mm/proc-arm720.S

@@ -138,7 +138,7 @@ __arm710_setup:	mov	r0, #0
 		bic	r0, r0, #0x0e00			@ ..V. ..RS BLDP WCAM
 		orr	r0, r0, #0x0100			@ .... .... .111 .... (old)
 		orr	r0, r0, #0x003d			@ .... ..01 ..11 1101 (new)
-		mov	pc, lr				@ __ret (head-armv.S)
+		mov	pc, lr				@ __ret (head.S)
 		.size	__arm710_setup, . - __arm710_setup
 
 		.type	__arm720_setup, #function
@@ -153,7 +153,7 @@ __arm720_setup:	mov	r0, #0
 		bic	r0, r0, #0x0e00			@ ..V. ..RS BLDP WCAM
 		orr	r0, r0, #0x2100			@ .... .... .111 .... (old)
 		orr	r0, r0, #0x003d			@ ..1. ..01 ..11 1101 (new)
-		mov	pc, lr				@ __ret (head-armv.S)
+		mov	pc, lr				@ __ret (head.S)
 		.size	__arm720_setup, . - __arm720_setup
 
 		__INITDATA

drivers/char/s3c2410-rtc.c

@@ -12,6 +12,7 @@
  *  Changelog:
  *	08-Nov-2004	BJD	Initial creation
  *	12-Nov-2004	BJD	Added periodic IRQ and PM code
+ *	22-Nov-2004	BJD	Sign-test on alarm code to check for <0
 */
 
 #include <linux/module.h>
@@ -236,26 +237,26 @@ static int s3c2410_rtc_setalarm(struct rtc_wkalrm *alrm)
 	struct rtc_time *tm = &alrm->time;
 	unsigned int alrm_en;
 
-	pr_debug("s3c2410_rtc_setalarm: %d, %02x.%02x.%02x %02x/%02x/%02x\n",
+	pr_debug("s3c2410_rtc_setalarm: %d, %02x/%02x/%02x %02x.%02x.%02x\n",
 		 alrm->enabled,
-		 tm->tm_year & 0xff, tm->tm_mon & 0xff, tm->tm_mday & 0xff,
-		 tm->tm_hour, tm->tm_min, tm->tm_sec);
+		 tm->tm_mday & 0xff, tm->tm_mon & 0xff, tm->tm_year & 0xff,
+		 tm->tm_hour & 0xff, tm->tm_min & 0xff, tm->tm_sec);
 
 	if (alrm->enabled || 1) {
 		alrm_en = readb(S3C2410_RTCALM) & S3C2410_RTCALM_ALMEN;
 		writeb(0x00, S3C2410_RTCALM);
 
-		if (tm->tm_sec < 60) {
+		if (tm->tm_sec < 60 && tm->tm_sec >= 0) {
 			alrm_en |= S3C2410_RTCALM_SECEN;
 			writeb(BIN2BCD(tm->tm_sec), S3C2410_ALMSEC);
 		}
 
-		if (tm->tm_min < 60) {
+		if (tm->tm_min < 60 && tm->tm_min >= 0) {
 			alrm_en |= S3C2410_RTCALM_MINEN;
 			writeb(BIN2BCD(tm->tm_min), S3C2410_ALMMIN);
 		}
 
-		if (tm->tm_hour < 24) {
+		if (tm->tm_hour < 24 && tm->tm_hour >= 0) {
 			alrm_en |= S3C2410_RTCALM_HOUREN;
 			writeb(BIN2BCD(tm->tm_hour), S3C2410_ALMHOUR);
 		}

include/asm-arm/procinfo.h

@@ -24,13 +24,13 @@ struct processor;
  *
  * NOTE! The following structure is defined by assembly
  * language, NOT C code.  For more information, check:
- *  arch/arm/mm/proc-*.S and arch/arm/kernel/head-armv.S
+ *  arch/arm/mm/proc-*.S and arch/arm/kernel/head.S
  */
 struct proc_info_list {
 	unsigned int		cpu_val;
 	unsigned int		cpu_mask;
-	unsigned long		__cpu_mmu_flags;	/* used by head-armv.S */
-	unsigned long		__cpu_flush;		/* used by head-armv.S */
+	unsigned long		__cpu_mmu_flags;	/* used by head.S */
+	unsigned long		__cpu_flush;		/* used by head.S */
 	const char		*arch_name;
 	const char		*elf_name;
 	unsigned int		elf_hwcap;