Merge branch 'alarm' into release

diff --combined drivers/acpi/proc.c
index 1c4851ff2657bbb875813f81a02c098ed1ae13f1,2d0e6b577502c482552bc81cf082df42cbfa0e1b..428c911dba086511281e3b89b80642657a480d90
--- 1/drivers/acpi/proc.c
--- 2/drivers/acpi/sleep/proc.c
+++ b/drivers/acpi/proc.c
@@@ -28,6 -28,8 +28,6 @@@ static int acpi_system_sleep_seq_show(s
  {
        int i;
  
 -      ACPI_FUNCTION_TRACE("acpi_system_sleep_seq_show");
 -
        for (i = 0; i <= ACPI_STATE_S5; i++) {
                if (sleep_states[i]) {
                        seq_printf(seq, "S%d ", i);
@@@ -84,47 -86,46 +84,44 @@@ acpi_system_write_sleep(struct file *fi
  
  #ifdef        HAVE_ACPI_LEGACY_ALARM
  
+ static u32 cmos_bcd_read(int offset, int rtc_control);
+ 
  static int acpi_system_alarm_seq_show(struct seq_file *seq, void *offset)
  {
        u32 sec, min, hr;
        u32 day, mo, yr, cent = 0;
+       u32 today = 0;
        unsigned char rtc_control = 0;
        unsigned long flags;
  
 -      ACPI_FUNCTION_TRACE("acpi_system_alarm_seq_show");
 -
        spin_lock_irqsave(&rtc_lock, flags);
  
-       sec = CMOS_READ(RTC_SECONDS_ALARM);
-       min = CMOS_READ(RTC_MINUTES_ALARM);
-       hr = CMOS_READ(RTC_HOURS_ALARM);
        rtc_control = CMOS_READ(RTC_CONTROL);
+       sec = cmos_bcd_read(RTC_SECONDS_ALARM, rtc_control);
+       min = cmos_bcd_read(RTC_MINUTES_ALARM, rtc_control);
+       hr = cmos_bcd_read(RTC_HOURS_ALARM, rtc_control);
  
        /* If we ever get an FACP with proper values... */
-       if (acpi_gbl_FADT.day_alarm)
+       if (acpi_gbl_FADT.day_alarm) {
                /* ACPI spec: only low 6 its should be cared */
                day = CMOS_READ(acpi_gbl_FADT.day_alarm) & 0x3F;
-       else
-               day = CMOS_READ(RTC_DAY_OF_MONTH);
+               if (!(rtc_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD)
+                       day = bcd2bin(day);
+       } else
+               day = cmos_bcd_read(RTC_DAY_OF_MONTH, rtc_control);
        if (acpi_gbl_FADT.month_alarm)
-               mo = CMOS_READ(acpi_gbl_FADT.month_alarm);
-       else
-               mo = CMOS_READ(RTC_MONTH);
+               mo = cmos_bcd_read(acpi_gbl_FADT.month_alarm, rtc_control);
+       else {
+               mo = cmos_bcd_read(RTC_MONTH, rtc_control);
+               today = cmos_bcd_read(RTC_DAY_OF_MONTH, rtc_control);
+       }
        if (acpi_gbl_FADT.century)
-               cent = CMOS_READ(acpi_gbl_FADT.century);
+               cent = cmos_bcd_read(acpi_gbl_FADT.century, rtc_control);
  
-       yr = CMOS_READ(RTC_YEAR);
+       yr = cmos_bcd_read(RTC_YEAR, rtc_control);
  
        spin_unlock_irqrestore(&rtc_lock, flags);
  
-       if (!(rtc_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD) {
-               sec = bcd2bin(sec);
-               min = bcd2bin(min);
-               hr = bcd2bin(hr);
-               day = bcd2bin(day);
-               mo = bcd2bin(mo);
-               yr = bcd2bin(yr);
-               cent = bcd2bin(cent);
-       }
- 
        /* we're trusting the FADT (see above) */
        if (!acpi_gbl_FADT.century)
                /* If we're not trusting the FADT, we should at least make it
@@@ -149,6 -150,20 +146,20 @@@
        else
                yr += cent * 100;
  
+       /*
+        * Show correct dates for alarms up to a month into the future.
+        * This solves issues for nearly all situations with the common
+        * 30-day alarm clocks in PC hardware.
+        */
+       if (day < today) {
+               if (mo < 12) {
+                       mo += 1;
+               } else {
+                       mo = 1;
+                       yr += 1;
+               }
+       }
+ 
        seq_printf(seq, "%4.4u-", yr);
        (mo > 12) ? seq_puts(seq, "**-") : seq_printf(seq, "%2.2u-", mo);
        (day > 31) ? seq_puts(seq, "** ") : seq_printf(seq, "%2.2u ", day);
@@@ -223,11 -238,13 +234,11 @@@ acpi_system_write_alarm(struct file *fi
        int adjust = 0;
        unsigned char rtc_control = 0;
  
 -      ACPI_FUNCTION_TRACE("acpi_system_write_alarm");
 -
        if (count > sizeof(alarm_string) - 1)
 -              return_VALUE(-EINVAL);
 +              return -EINVAL;
  
        if (copy_from_user(alarm_string, buffer, count))
 -              return_VALUE(-EFAULT);
 +              return -EFAULT;
  
        alarm_string[count] = '\0';
  
@@@ -328,7 -345,7 +339,7 @@@
  
        result = 0;
        end:
 -      return_VALUE(result ? result : count);
 +      return result ? result : count;
  }
  #endif                                /* HAVE_ACPI_LEGACY_ALARM */