diff options
| author | Richard Henderson <rth@dorothy.sfbay.redhat.com> | 2002-12-06 23:16:45 -0800 |
|---|---|---|
| committer | Richard Henderson <rth@dorothy.sfbay.redhat.com> | 2002-12-06 23:16:45 -0800 |
| commit | f2dc3735e6c475651651acabacba78be0e59e4d9 (patch) | |
| tree | 66055ab95e9824559bd3c31a04a6c8c450140d51 /include | |
| parent | b46aedbc13aa8581ab609edb277a555286aa19f3 (diff) | |
| parent | d6f7dad977fc3b708f3ad7c785661b6ed62748ae (diff) | |
Merge dorothy.sfbay.redhat.com:/dorothy/rth/linux/linus-2.5
into dorothy.sfbay.redhat.com:/dorothy/rth/linux/axp-2.5
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-alpha/current.h | 2 | ||||
| -rw-r--r-- | include/asm-alpha/pci.h | 2 | ||||
| -rw-r--r-- | include/asm-alpha/thread_info.h | 5 | ||||
| -rw-r--r-- | include/asm-alpha/unistd.h | 3 |
4 files changed, 10 insertions, 2 deletions
diff --git a/include/asm-alpha/current.h b/include/asm-alpha/current.h index dccab45e2c9e..8d88a13c1bec 100644 --- a/include/asm-alpha/current.h +++ b/include/asm-alpha/current.h @@ -1,7 +1,7 @@ #ifndef _ALPHA_CURRENT_H #define _ALPHA_CURRENT_H -#include <asm/thread_info.h> +#include <linux/thread_info.h> #define get_current() (current_thread_info()->task + 0) #define current get_current() diff --git a/include/asm-alpha/pci.h b/include/asm-alpha/pci.h index ae1e9c9a2c44..60af31abecd6 100644 --- a/include/asm-alpha/pci.h +++ b/include/asm-alpha/pci.h @@ -6,6 +6,8 @@ #include <linux/spinlock.h> #include <asm/scatterlist.h> #include <asm/machvec.h> +#include <asm/io.h> + /* * The following structure is used to manage multiple PCI busses. diff --git a/include/asm-alpha/thread_info.h b/include/asm-alpha/thread_info.h index 2702e1ccd89d..40d1416a7037 100644 --- a/include/asm-alpha/thread_info.h +++ b/include/asm-alpha/thread_info.h @@ -25,6 +25,8 @@ struct thread_info { int bpt_nsaved; unsigned long bpt_addr[2]; /* breakpoint handling */ unsigned int bpt_insn[2]; + + struct restart_block restart_block; }; /* @@ -35,6 +37,9 @@ struct thread_info { task: &tsk, \ exec_domain: &default_exec_domain, \ addr_limit: KERNEL_DS, \ + .restart_block = { \ + .fn = do_no_restart_syscall, \ + }, \ } #define init_thread_info (init_thread_union.thread_info) diff --git a/include/asm-alpha/unistd.h b/include/asm-alpha/unistd.h index 36585f474abe..da926dbabc93 100644 --- a/include/asm-alpha/unistd.h +++ b/include/asm-alpha/unistd.h @@ -349,7 +349,8 @@ #define __NR_sys_epoll_wait 409 #define __NR_remap_file_pages 410 #define __NR_set_tid_address 411 -#define NR_SYSCALLS 412 +#define __NR_restart_syscall 412 +#define NR_SYSCALLS 413 #if defined(__GNUC__) |