diff options
| author | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
| commit | c4366889dda8110247be59ca41fddb82951a8c26 (patch) | |
| tree | 705c1a996bed8fd48ce94ff33ec9fd00f9b94875 /arch/um/os-Linux/sys-i386/tls.c | |
| parent | db2fb9db5735cc532fd4fc55e94b9a3c3750378e (diff) | |
| parent | e1036502e5263851259d147771226161e5ccc85a (diff) | |
Merge ../linus
Conflicts:
drivers/cpufreq/cpufreq.c
Diffstat (limited to 'arch/um/os-Linux/sys-i386/tls.c')
| -rw-r--r-- | arch/um/os-Linux/sys-i386/tls.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/um/os-Linux/sys-i386/tls.c b/arch/um/os-Linux/sys-i386/tls.c index 6e945ab45843..256532034c62 100644 --- a/arch/um/os-Linux/sys-i386/tls.c +++ b/arch/um/os-Linux/sys-i386/tls.c | |||
| @@ -1,6 +1,9 @@ | |||
| 1 | #include <errno.h> | 1 | #include <errno.h> |
| 2 | #include <linux/unistd.h> | 2 | #include <linux/unistd.h> |
| 3 | |||
| 3 | #include <sys/syscall.h> | 4 | #include <sys/syscall.h> |
| 5 | #include <unistd.h> | ||
| 6 | |||
| 4 | #include "sysdep/tls.h" | 7 | #include "sysdep/tls.h" |
| 5 | #include "user_util.h" | 8 | #include "user_util.h" |
| 6 | 9 | ||