public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Geoff Levand <geoffrey.levand@am.sony.com>
To: linux-kernel@vger.kernel.org
Cc: George Anzinger <george@mvista.com>
Subject: [PATCH] Fix posix_bump_timer args
Date: Wed, 06 Jul 2005 11:26:31 -0700	[thread overview]
Message-ID: <42CC2257.4030400@am.sony.com> (raw)

This patch makes posix_bump_timer() consistent with common convention 
by expecting a pointer to the structure be passed.

Please apply.


Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com> for CELF

--
--- linux-2.6.12.1.orig/include/linux/posix-timers.h	2005-06-17 12:48:29.000000000 -0700
+++ linux-2.6.12.1/include/linux/posix-timers.h.bump	2005-07-06 10:58:52.000000000 -0700
@@ -108,7 +108,7 @@
 #define posix_bump_timer(timr, now)					\
          do {								\
               long delta, orun;						\
-	      delta = now.jiffies - (timr)->it.real.timer.expires;	\
+	      delta = (now)->jiffies - (timr)->it.real.timer.expires;	\
               if (delta >= 0) {						\
 	           orun = 1 + (delta / (timr)->it.real.incr);		\
 	          (timr)->it.real.timer.expires +=			\

--- linux-2.6.12.1.orig/kernel/posix-timers.c	2005-06-17 12:48:29.000000000 -0700
+++ linux-2.6.12.1/kernel/posix-timers.c.bump	2005-07-06 10:54:48.000000000 -0700
@@ -384,11 +384,11 @@
 		spin_lock(&abs_list.lock);
 		add_clockset_delta(timr, &new_wall_to);
 
-		posix_bump_timer(timr, now);
+		posix_bump_timer(timr, &now);
 
 		spin_unlock(&abs_list.lock);
 	} else {
-		posix_bump_timer(timr, now);
+		posix_bump_timer(timr, &now);
 	}
 	timr->it_overrun_last = timr->it_overrun;
 	timr->it_overrun = -1;
@@ -810,7 +810,7 @@
 	if (expires) {
 		if (timr->it_requeue_pending & REQUEUE_PENDING ||
 		    (timr->it_sigev_notify & ~SIGEV_THREAD_ID) == SIGEV_NONE) {
-			posix_bump_timer(timr, now);
+			posix_bump_timer(timr, &now);
 			expires = timr->it.real.timer.expires;
 		}
 		else



             reply	other threads:[~2005-07-06 20:06 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-07-06 18:26 Geoff Levand [this message]
2005-07-07  0:17 ` [PATCH] Fix posix_bump_timer args randy_dunlap
2005-07-07  0:40   ` Geoff Levand

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=42CC2257.4030400@am.sony.com \
    --to=geoffrey.levand@am.sony.com \
    --cc=george@mvista.com \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox