Skip to contentSkip to conversation

char/drm_os_linux:

PATCH Applied Keith Whitwell 6 participants 6 messages Sep 16, 2004 – Sep 29, 2004 Kernel janitors

lore
Share & tools
lore

Keith Whitwell

author
#0 lore raw
Quoted 11 lines · Nishanth Aravamudan

Any comments would be appreciated.

Description: Use set_current_state() instead of direct assignment of current->state.

Signed-off-by Nishanth Aravamudan <[email protected]>

drivers/char/drm/drm_os_linux.h do { \ · line 140

Quoted 8 lines
drivers/char/drm/drm_os_linux.h +1 -1
@@ -134,7 +134,7 @@ do {								\
 	add_wait_queue(&(queue), &entry);			\
 								\
 	for (;;) {						\
-		current->state = TASK_INTERRUPTIBLE;		\
+		set_current_state(TASK_INTERRUPTIBLE);		\
 		if (condition)					\
 			break;					\
 		if (time_after_eq(jiffies, end)) {		\

There are two assignments in that macro, aren't there? Why not adjust both of them?

Keith
_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors

#1 lore raw

I'll apply this to my tree and fix up the rest of them in the DRM, and push it to Linus..

Dave.

Quoted 31 lines · Nishanth Aravamudan

Any comments would be appreciated.

Description: Use set_current_state() instead of direct assignment of current->state.

Signed-off-by Nishanth Aravamudan <[email protected]>
drivers/char/drm/drm_os_linux.h +1 -2
@@ -134,7 +134,7 @@ do {								\
 	add_wait_queue(&(queue), &entry);			\
 								\
 	for (;;) {						\
-		current->state = TASK_INTERRUPTIBLE;		\
+		set_current_state(TASK_INTERRUPTIBLE);		\
 		if (condition)					\
 			break;					\
 		if (time_after_eq(jiffies, end)) {		\
 
 
-------------------------------------------------------

This SF.Net email is sponsored by: thawte's Crypto Challenge Vl Crack the code and win a Sony DCRHC40 MiniDV Digital Handycam Camcorder. More prizes in the weekly Lunch Hour Challenge. Sign up NOW http://ad.doubleclick.net/clk;10740251;10262165;m
--
_______________________________________________
Dri-devel mailing list [email protected]
https://lists.sourceforge.net/lists/listinfo/dri-devel

Signature · 3 lines
David Airlie, Software Engineer
http://www.skynet.ie/~airlied / airlied at skynet.ie
pam_smb / Linux DECstation / Linux VAX / ILUG person

_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors

#2 lore raw
In reply to Keith Whitwell
Quoted 2 lines · Dave Airlie

I'll apply this to my tree and fix up the rest of them in the DRM, and push it to Linus..

Use __set_current_state() for these. set_current_state also includes a memory barrier (ie its designed to be safe for all uses) while the DRI code is already careful.

Alan

_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors

#3 lore raw
In reply to Keith Whitwell

Dave, I just fixed this one in DRM CVS.

Quoted 47 lines · Nishanth Aravamudan

Re-submission of patch incorporating Alan Cox's suggestion of using __set_current_state() and changing the other direct assignment in the macro.

Thanks,
Nish

Description: Use set_current_state() instead of direct assignment of current->state.

Signed-off-by Nishanth Aravamudan <[email protected]>
drivers/char/drm/drm_os_linux.h 2004-09-16 00:10:47.000000000 -0700 renamed from drivers/char/drm/drm_os_linux.h 2004-09-13 17:15:48.000000000 -0700 +2 -3
@@ -134,7 +134,7 @@ do {                                                                \
        add_wait_queue(&(queue), &entry);                       \
                                                                \
        for (;;) {                                              \
-               current->state = TASK_INTERRUPTIBLE;            \
+               __set_current_state(TASK_INTERRUPTIBLE);                \
                if (condition)                                  \
                        break;                                  \
                if (time_after_eq(jiffies, end)) {              \

@@ -147,7 +147,7 @@ do {                                                                \
                        break;                                  \
                }                                               \
        }                                                       \
-       current->state = TASK_RUNNING;                          \
+       __set_current_state(TASK_RUNNING);                      \
        remove_wait_queue(&(queue), &entry);                    \
 } while (0)
 
 
 
 
-------------------------------------------------------

This SF.Net email is sponsored by: YOU BE THE JUDGE. Be one of 170 Project Admins to receive an Apple iPod Mini FREE for your judgement on who ports your project to Linux PPC the best. Sponsored by IBM.
Deadline: Sept. 24. Go here: http://sf.net/ppc_contest.php
--
_______________________________________________
Dri-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/dri-devel

Signature · 2 lines
Jon Smirl
[email protected]

_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors

#4 lore raw

[Kernel-janitors] Re: [PATCH 2.6.9-rc2 3/4] sbus/bbc_i2c: replace

In reply to Keith Whitwell
Quoted 5 lines · On Mon, 27 Sep 2004 10:26:56 -0700 Nishanth Aravamudan <[email protected]> wrote:

Any comments would be appreciated.

Description: Use msleep_interruptible() instead of schedule_timeout() to guarantee the task delays as expected. Also use set_current_state() instead of direct assignment of current->state.

Also applied, thanks.

_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors

Applied
#5 lore raw

[Kernel-janitors] Re: [PATCH 2.6.9-rc2 3/4] pci hotplug/pciehp:

In reply to Keith Whitwell
Quoted 6 lines · Nishanth Aravamudan

Any comments would be appreciated.

Description: Use msleep_interruptible() instead of schedule_timeout() to guarantee the task delays as expected.

Signed-off-by Nishanth Aravamudan <[email protected]>

Applied, thanks.

greg k-h

_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors