diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-24 08:41:41 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-24 13:07:53 -0400 |
| commit | 816724e65c72a90a44fbad0ef0b59b186c85fa90 (patch) | |
| tree | 421fa29aedff988e392f92780637553e275d37a0 /include/asm-m68k/processor.h | |
| parent | 70ac4385a13f78bc478f26d317511893741b05bd (diff) | |
| parent | d384ea691fe4ea8c2dd5b9b8d9042eb181776f18 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
fs/nfs/inode.c
fs/super.c
Fix conflicts between patch 'NFS: Split fs/nfs/inode.c' and patch
'VFS: Permit filesystem to override root dentry on mount'
Diffstat (limited to 'include/asm-m68k/processor.h')
| -rw-r--r-- | include/asm-m68k/processor.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-m68k/processor.h b/include/asm-m68k/processor.h index 352799e71f08..8455f778b601 100644 --- a/include/asm-m68k/processor.h +++ b/include/asm-m68k/processor.h | |||
| @@ -71,10 +71,10 @@ struct thread_struct { | |||
| 71 | }; | 71 | }; |
| 72 | 72 | ||
| 73 | #define INIT_THREAD { \ | 73 | #define INIT_THREAD { \ |
| 74 | ksp: sizeof(init_stack) + (unsigned long) init_stack, \ | 74 | .ksp = sizeof(init_stack) + (unsigned long) init_stack, \ |
| 75 | sr: PS_S, \ | 75 | .sr = PS_S, \ |
| 76 | fs: __KERNEL_DS, \ | 76 | .fs = __KERNEL_DS, \ |
| 77 | info: INIT_THREAD_INFO(init_task) \ | 77 | .info = INIT_THREAD_INFO(init_task), \ |
| 78 | } | 78 | } |
| 79 | 79 | ||
| 80 | /* | 80 | /* |