diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-28 22:00:09 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-28 22:00:09 +0000 |
| commit | 1a1d77dd589de5a567fa95e36aa6999c704ceca4 (patch) | |
| tree | 141e31f89f18b9fe0831f31852e0435ceaccafc5 /include/asm-alpha | |
| parent | fb9c690a18b3d66925a65b17441c37fa14d4370b (diff) | |
Merge with 2.4.0-test7.
Diffstat (limited to 'include/asm-alpha')
| -rw-r--r-- | include/asm-alpha/bitops.h | 2 | ||||
| -rw-r--r-- | include/asm-alpha/fcntl.h | 4 | ||||
| -rw-r--r-- | include/asm-alpha/mmu_context.h | 3 | ||||
| -rw-r--r-- | include/asm-alpha/unistd.h | 1 |
4 files changed, 9 insertions, 1 deletions
diff --git a/include/asm-alpha/bitops.h b/include/asm-alpha/bitops.h index 4cdfb21d5..69bfdcaf1 100644 --- a/include/asm-alpha/bitops.h +++ b/include/asm-alpha/bitops.h @@ -271,6 +271,8 @@ extern inline unsigned long find_next_zero_bit(void * addr, unsigned long size, tmp = *p; found_first: tmp |= ~0UL << size; + if (tmp == ~0UL) /* Are any bits zero? */ + return result + size; /* Nope. */ found_middle: return result + ffz(tmp); } diff --git a/include/asm-alpha/fcntl.h b/include/asm-alpha/fcntl.h index 0c4a08e30..314e3addb 100644 --- a/include/asm-alpha/fcntl.h +++ b/include/asm-alpha/fcntl.h @@ -63,4 +63,8 @@ struct flock { __kernel_pid_t l_pid; }; +#ifdef __KERNEL__ +#define flock64 flock +#endif + #endif diff --git a/include/asm-alpha/mmu_context.h b/include/asm-alpha/mmu_context.h index b44e4a428..219b8bd4e 100644 --- a/include/asm-alpha/mmu_context.h +++ b/include/asm-alpha/mmu_context.h @@ -205,11 +205,12 @@ ev4_activate_mm(struct mm_struct *prev_mm, struct mm_struct *next_mm) # endif #endif -extern inline void +extern inline int init_new_context(struct task_struct *tsk, struct mm_struct *mm) { mm->context = 0; tsk->thread.ptbr = ((unsigned long)mm->pgd - IDENT_ADDR) >> PAGE_SHIFT; + return 0; } extern inline void diff --git a/include/asm-alpha/unistd.h b/include/asm-alpha/unistd.h index 75453ddfd..4a5b98607 100644 --- a/include/asm-alpha/unistd.h +++ b/include/asm-alpha/unistd.h @@ -314,6 +314,7 @@ #define __NR_pivot_root 374 #define __NR_mincore 375 #define __NR_pciconfig_iobase 376 +#define __NR_getdents64 377 #if defined(__GNUC__) |