diff options
| author | David S. Miller <davem@davemloft.net> | 2009-08-12 20:44:53 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-12 20:44:53 -0400 |
| commit | aa11d958d1a6572eda08214d7c6a735804fe48a5 (patch) | |
| tree | d025b05270ad1e010660d17eeadc6ac3c1abbd7d /arch/m68k/include/asm/thread_info_no.h | |
| parent | 07f6642ee9418e962e54cbc07471cfe2e559c568 (diff) | |
| parent | 9799218ae36910af50f002a5db1802d576fffb43 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
arch/microblaze/include/asm/socket.h
Diffstat (limited to 'arch/m68k/include/asm/thread_info_no.h')
| -rw-r--r-- | arch/m68k/include/asm/thread_info_no.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/m68k/include/asm/thread_info_no.h b/arch/m68k/include/asm/thread_info_no.h index 82529f424ea3..c2bde5e24b0b 100644 --- a/arch/m68k/include/asm/thread_info_no.h +++ b/arch/m68k/include/asm/thread_info_no.h | |||
| @@ -49,6 +49,7 @@ struct thread_info { | |||
| 49 | .exec_domain = &default_exec_domain, \ | 49 | .exec_domain = &default_exec_domain, \ |
| 50 | .flags = 0, \ | 50 | .flags = 0, \ |
| 51 | .cpu = 0, \ | 51 | .cpu = 0, \ |
| 52 | .preempt_count = INIT_PREEMPT_COUNT, \ | ||
| 52 | .restart_block = { \ | 53 | .restart_block = { \ |
| 53 | .fn = do_no_restart_syscall, \ | 54 | .fn = do_no_restart_syscall, \ |
| 54 | }, \ | 55 | }, \ |