Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 117425
b: refs/heads/master
c: 5077c2a
h: refs/heads/master
i:
  117423: dea8804
v: v3
  • Loading branch information
Al Viro authored and H. Peter Anvin committed Oct 23, 2008
1 parent bb008c0 commit 5a7a154
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7127da4ee4447cb718c5ae553878458ec5e648f8
refs/heads/master: 5077c2a9cd43e8db71f8257e745e1d27e7b79d3f
2 changes: 1 addition & 1 deletion trunk/arch/um/include/asm/processor-i386.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ static inline void arch_copy_thread(struct arch_thread *from,
memcpy(&to->tls_array, &from->tls_array, sizeof(from->tls_array));
}

#include "asm/arch/user.h"
#include <asm/user.h>

/* REP NOP (PAUSE) is a good thing to insert into busy-wait loops. */
static inline void rep_nop(void)
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/um/include/asm/processor-x86_64.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ static inline void arch_copy_thread(struct arch_thread *from,
to->fs = from->fs;
}

#include "asm/arch/user.h"
#include <asm/user.h>

#define current_text_addr() \
({ void *pc; __asm__("movq $1f,%0\n1:":"=g" (pc)); pc; })
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/um/include/asm/ptrace-generic.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#ifndef __ASSEMBLY__

#include "asm/arch/ptrace-abi.h"
#include <asm/ptrace-abi.h>
#include <asm/user.h>
#include "sysdep/ptrace.h"

Expand Down

0 comments on commit 5a7a154

Please sign in to comment.