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-s390 | |
| parent | fb9c690a18b3d66925a65b17441c37fa14d4370b (diff) | |
Merge with 2.4.0-test7.
Diffstat (limited to 'include/asm-s390')
| -rw-r--r-- | include/asm-s390/mmu_context.h | 2 | ||||
| -rw-r--r-- | include/asm-s390/unistd.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-s390/mmu_context.h b/include/asm-s390/mmu_context.h index c2a215135..71f0f66df 100644 --- a/include/asm-s390/mmu_context.h +++ b/include/asm-s390/mmu_context.h @@ -12,7 +12,7 @@ /* * get a new mmu context.. S390 don't know about contexts. */ -#define init_new_context(tsk,mm) do { } while (0) +#define init_new_context(tsk,mm) 0 #define destroy_context(mm) flush_tlb_mm(mm) diff --git a/include/asm-s390/unistd.h b/include/asm-s390/unistd.h index 4dd04edbc..e7da084b0 100644 --- a/include/asm-s390/unistd.h +++ b/include/asm-s390/unistd.h @@ -208,6 +208,7 @@ #define __NR_pivot_root 217 #define __NR_mincore 218 #define __NR_madvise 219 +#define __NR_getdents64 220 /* user-visible error numbers are in the range -1 - -122: see <asm-s390/errno.h> */ |