linux-rt-users.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Dinakar Guniguntala <dino@in.ibm.com>
To: linux-rt-users <linux-rt-users@vger.kernel.org>,
	linux-kernel@vger.kernel.org, Ingo Molnar <mingo@elte.hu>,
	Thomas Gleixner <tglx@linutronix.de>,
	Darren Hart <dvhltc@us.ibm.com>
Subject: [PATCH] futex: fix compat_futex to be same as futex for REQUEUE_PI
Date: Mon, 10 Aug 2009 18:31:42 +0530	[thread overview]
Message-ID: <20090810130142.GA23619@in.ibm.com> (raw)

From: Dinakar Guniguntala <dino@in.ibm.com>

Need to add the REQUEUE_PI checks to the compat_sys_futex API as well to
ensure 32 bit requeue's work fine on a 64 bit system.
Patch is against latest tip

Signed-off-by: Dinakar Guniguntala <dino@in.ibm.com>
CC: Darren Hart <dvhltc@us.ibm.com>

	-Dinakar


 futex_compat.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)


diff -X ignore -Nurp linux-tip/kernel/futex_compat.c linux-tip.mod/kernel/futex_compat.c
--- linux-tip/kernel/futex_compat.c	2009-08-10 05:37:17.000000000 -0700
+++ linux-tip.mod/kernel/futex_compat.c	2009-08-10 05:46:42.000000000 -0700
@@ -180,7 +180,8 @@ asmlinkage long compat_sys_futex(u32 __u
 	int cmd = op & FUTEX_CMD_MASK;
 
 	if (utime && (cmd == FUTEX_WAIT || cmd == FUTEX_LOCK_PI ||
-		      cmd == FUTEX_WAIT_BITSET)) {
+		      cmd == FUTEX_WAIT_BITSET ||
+		      cmd == FUTEX_WAIT_REQUEUE_PI)) {
 		if (get_compat_timespec(&ts, utime))
 			return -EFAULT;
 		if (!timespec_valid(&ts))
@@ -191,7 +192,8 @@ asmlinkage long compat_sys_futex(u32 __u
 			t = ktime_add_safe(ktime_get(), t);
 		tp = &t;
 	}
-	if (cmd == FUTEX_REQUEUE || cmd == FUTEX_CMP_REQUEUE)
+	if (cmd == FUTEX_REQUEUE || cmd == FUTEX_CMP_REQUEUE ||
+	    cmd == FUTEX_CMP_REQUEUE_PI || cmd == FUTEX_WAKE_OP)
 		val2 = (int) (unsigned long) utime;
 
 	return do_futex(uaddr, op, val, tp, uaddr2, val2, val3);

                 reply	other threads:[~2009-08-10 13:01 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20090810130142.GA23619@in.ibm.com \
    --to=dino@in.ibm.com \
    --cc=dvhltc@us.ibm.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-rt-users@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=tglx@linutronix.de \
    /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;
as well as URLs for NNTP newsgroup(s).