diff options
| author | James Simmons <jsimmons@maxwell.earthlink.net> | 2003-02-27 17:57:47 -0800 |
|---|---|---|
| committer | James Simmons <jsimmons@maxwell.earthlink.net> | 2003-02-27 17:57:47 -0800 |
| commit | 7d1f6b3304e311e917a657ee9ba04416c802c912 (patch) | |
| tree | d57dd5830a507e617bcc5bdb602e4b24d571e67c /include/asm-alpha | |
| parent | 3da8fdc5a21f8a15048f6c43449d2a3f44fd8ab4 (diff) | |
| parent | 63ac2a63e5d31b6d1fbc6a4a55909be84f4e386f (diff) | |
Merge maxwell.earthlink.net:/usr/src/linus-2.5
into maxwell.earthlink.net:/usr/src/fbdev-2.5
Diffstat (limited to 'include/asm-alpha')
| -rw-r--r-- | include/asm-alpha/bitops.h | 2 | ||||
| -rw-r--r-- | include/asm-alpha/thread_info.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-alpha/bitops.h b/include/asm-alpha/bitops.h index c2013d1d8a3a..14879b4f33b5 100644 --- a/include/asm-alpha/bitops.h +++ b/include/asm-alpha/bitops.h @@ -288,7 +288,7 @@ static inline unsigned long __ffs(unsigned long word) #else unsigned long bits, qofs, bofs; - bits = __kernel_cmpbge(word, 0); + bits = __kernel_cmpbge(0, word); qofs = ffz_b(bits); bits = __kernel_extbl(word, qofs); bofs = ffz_b(~bits); diff --git a/include/asm-alpha/thread_info.h b/include/asm-alpha/thread_info.h index 40d1416a7037..f798b77816c9 100644 --- a/include/asm-alpha/thread_info.h +++ b/include/asm-alpha/thread_info.h @@ -34,9 +34,9 @@ struct thread_info { */ #define INIT_THREAD_INFO(tsk) \ { \ - task: &tsk, \ - exec_domain: &default_exec_domain, \ - addr_limit: KERNEL_DS, \ + .task = &tsk, \ + .exec_domain = &default_exec_domain, \ + .addr_limit = KERNEL_DS, \ .restart_block = { \ .fn = do_no_restart_syscall, \ }, \ |