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-ppc | |
| parent | fb9c690a18b3d66925a65b17441c37fa14d4370b (diff) | |
Merge with 2.4.0-test7.
Diffstat (limited to 'include/asm-ppc')
| -rw-r--r-- | include/asm-ppc/mmu_context.h | 2 | ||||
| -rw-r--r-- | include/asm-ppc/unistd.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-ppc/mmu_context.h b/include/asm-ppc/mmu_context.h index bdb1447ed..414dd1cdc 100644 --- a/include/asm-ppc/mmu_context.h +++ b/include/asm-ppc/mmu_context.h @@ -77,7 +77,7 @@ do { \ /* * Set up the context for a new address space. */ -#define init_new_context(tsk,mm) ((mm)->context = NO_CONTEXT) +#define init_new_context(tsk,mm) (((mm)->context = NO_CONTEXT), 0) /* * We're finished using the context for an address space. diff --git a/include/asm-ppc/unistd.h b/include/asm-ppc/unistd.h index db4e6499b..3b884cbb4 100644 --- a/include/asm-ppc/unistd.h +++ b/include/asm-ppc/unistd.h @@ -205,6 +205,7 @@ #define __NR_sys_pciconfig_write 199 #define __NR_sys_pciconfig_iobase 200 #define __NR_multiplexer 201 +#define __NR_getdents64 202 #define __NR(n) #n |