diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-07 15:45:24 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-07 15:45:24 +0000 |
| commit | 9f9f3e6e8548a596697778337110a423c384b6f3 (patch) | |
| tree | 5dd4b290ef532cf5ecb058e1a92cd3435afeac8c /include/asm-ia64 | |
| parent | d5c9a365ee7d2fded249aa5abfc5e89587583029 (diff) | |
Merge with Linux 2.3.49.
Diffstat (limited to 'include/asm-ia64')
| -rw-r--r-- | include/asm-ia64/pgtable.h | 1 | ||||
| -rw-r--r-- | include/asm-ia64/socket.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-ia64/pgtable.h b/include/asm-ia64/pgtable.h index a941cfccf..a076bca9f 100644 --- a/include/asm-ia64/pgtable.h +++ b/include/asm-ia64/pgtable.h @@ -87,6 +87,7 @@ #define PGDIR_MASK (~(PGDIR_SIZE-1)) #define PTRS_PER_PGD (__IA64_UL(1) << (PAGE_SHIFT-3)) #define USER_PTRS_PER_PGD PTRS_PER_PGD +#define FIRST_USER_PGD_NR 0 /* * Definitions for second level: diff --git a/include/asm-ia64/socket.h b/include/asm-ia64/socket.h index 8aeee3046..8c1f4d80a 100644 --- a/include/asm-ia64/socket.h +++ b/include/asm-ia64/socket.h @@ -46,4 +46,6 @@ #define SO_ATTACH_FILTER 26 #define SO_DETACH_FILTER 27 +#define SO_PEERNAME 28 + #endif /* _ASM_IA64_SOCKET_H */ |