Merge branch 'akpm' (updates from Andrew Morton)

Merge first patch-bomb from Andrew Morton:
 - various misc bits
 - I'm been patchmonkeying ocfs2 for a while, as Joel and Mark have been
   distracted.  There has been quite a bit of activity.
 - About half the MM queue
 - Some backlight bits
 - Various lib/ updates
 - checkpatch updates
 - zillions more little rtc patches
 - ptrace
 - signals
 - exec
 - procfs
 - rapidio
 - nbd
 - aoe
 - pps
 - memstick
 - tools/testing/selftests updates

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (445 commits)
  tools/testing/selftests: don't assume the x bit is set on scripts
  selftests: add .gitignore for kcmp
  selftests: fix clean target in kcmp Makefile
  selftests: add .gitignore for vm
  selftests: add hugetlbfstest
  self-test: fix make clean
  selftests: exit 1 on failure
  kernel/resource.c: remove the unneeded assignment in function __find_resource
  aio: fix wrong comment in aio_complete()
  drivers/w1/slaves/w1_ds2408.c: add magic sequence to disable P0 test mode
  drivers/memstick/host/r592.c: convert to module_pci_driver
  drivers/memstick/host/jmb38x_ms: convert to module_pci_driver
  pps-gpio: add device-tree binding and support
  drivers/pps/clients/pps-gpio.c: convert to module_platform_driver
  drivers/pps/clients/pps-gpio.c: convert to devm_* helpers
  drivers/parport/share.c: use kzalloc
  Documentation/accounting/getdelays.c: avoid strncpy in accounting tool
  aoe: update internal version number to v83
  aoe: update copyright date
  aoe: perform I/O completions in parallel
  ...

1 files changed, 15 insertions, 5 deletions

diff --git a/drivers/rtc/rtc-sysfs.c b/drivers/rtc/rtc-sysfs.c
index b70e2bb63645..4b26f8672b2d 100644
--- a/drivers/rtc/rtc-sysfs.c
+++ b/drivers/rtc/rtc-sysfs.c
@@ -164,6 +164,7 @@ rtc_sysfs_set_wakealarm(struct device *dev, struct device_attribute *attr,
 {
         ssize_t retval;
         unsigned long now, alarm;
+        unsigned long push = 0;
         struct rtc_wkalrm alm;
         struct rtc_device *rtc = to_rtc_device(dev);
         char *buf_ptr;
@@ -180,13 +181,17 @@ rtc_sysfs_set_wakealarm(struct device *dev, struct device_attribute *attr,
         buf_ptr = (char *)buf;
         if (*buf_ptr == '+') {
                 buf_ptr++;
-                adjust = 1;
+                if (*buf_ptr == '=') {
+                        buf_ptr++;
+                        push = 1;
+                } else
+                        adjust = 1;
         }
         alarm = simple_strtoul(buf_ptr, NULL, 0);
         if (adjust) {
                 alarm += now;
         }
-        if (alarm > now) {
+        if (alarm > now || push) {
                 /* Avoid accidentally clobbering active alarms; we can't
                  * entirely prevent that here, without even the minimal
                  * locking from the /dev/rtcN api.
@@ -194,9 +199,14 @@ rtc_sysfs_set_wakealarm(struct device *dev, struct device_attribute *attr,
                 retval = rtc_read_alarm(rtc, &alm);
                 if (retval < 0)
                         return retval;
-                if (alm.enabled)
-                        return -EBUSY;
-
+                if (alm.enabled) {
+                        if (push) {
+                                rtc_tm_to_time(&alm.time, &push);
+                                alarm += push;
+                        } else
+                                return -EBUSY;
+                } else if (push)
+                        return -EINVAL;
                 alm.enabled = 1;
         } else {
                 alm.enabled = 0;