Skip to content

Commit

Permalink
NPTL: swap comments for THREAD_SETMEM and THREAD_SETMEM_NC for i386 a…
Browse files Browse the repository at this point in the history
…nd x86_64

The comments for THREAD_SETMEM and THREAD_SETMEM_NC were swapped for
i386 and x86_64; this patch fixes that.
  • Loading branch information
Martin Galvan authored and Mike Frysinger committed Mar 28, 2015
1 parent 7285eb5 commit 4d611e1
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 4 deletions.
6 changes: 6 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
2015-03-27 Martin Galvan <martin.galvan@tallertechnologies.com>

* sysdeps/i386/nptl/tls.h: Swap comments between THREAD_SETMEM and
THREAD_SETMEM_NC.
* sysdeps/x86_64/nptl/tls.h: Ditto.

2015-03-27 Roland McGrath <roland@hack.frob.com>

* dlfcn/tststatic.c (main): Converted to ...
Expand Down
5 changes: 3 additions & 2 deletions sysdeps/i386/nptl/tls.h
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,8 @@ tls_fill_user_desc (union user_desc_init *desc,
__value; })


/* Same as THREAD_SETMEM, but the member offset can be non-constant. */

/* Set member of the thread descriptor directly. */
# define THREAD_SETMEM(descr, member, value) \
({ if (sizeof (descr->member) == 1) \
asm volatile ("movb %b0,%%gs:%P1" : \
Expand All @@ -341,7 +342,7 @@ tls_fill_user_desc (union user_desc_init *desc,
}})


/* Set member of the thread descriptor directly. */
/* Same as THREAD_SETMEM, but the member offset can be non-constant. */
# define THREAD_SETMEM_NC(descr, member, idx, value) \
({ if (sizeof (descr->member[0]) == 1) \
asm volatile ("movb %b0,%%gs:%P1(%2)" : \
Expand Down
4 changes: 2 additions & 2 deletions sysdeps/x86_64/nptl/tls.h
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ typedef struct
#endif


/* Same as THREAD_SETMEM, but the member offset can be non-constant. */
/* Set member of the thread descriptor directly. */
# define THREAD_SETMEM(descr, member, value) \
({ if (sizeof (descr->member) == 1) \
asm volatile ("movb %b0,%%fs:%P1" : \
Expand All @@ -273,7 +273,7 @@ typedef struct
}})


/* Set member of the thread descriptor directly. */
/* Same as THREAD_SETMEM, but the member offset can be non-constant. */
# define THREAD_SETMEM_NC(descr, member, idx, value) \
({ if (sizeof (descr->member[0]) == 1) \
asm volatile ("movb %b0,%%fs:%P1(%q2)" : \
Expand Down

0 comments on commit 4d611e1

Please sign in to comment.