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-m68k | |
| parent | d5c9a365ee7d2fded249aa5abfc5e89587583029 (diff) | |
Merge with Linux 2.3.49.
Diffstat (limited to 'include/asm-m68k')
| -rw-r--r-- | include/asm-m68k/pgtable.h | 1 | ||||
| -rw-r--r-- | include/asm-m68k/socket.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-m68k/pgtable.h b/include/asm-m68k/pgtable.h index a92c28b12..8e0f4f24c 100644 --- a/include/asm-m68k/pgtable.h +++ b/include/asm-m68k/pgtable.h @@ -43,6 +43,7 @@ #define PTRS_PER_PMD 8 #define PTRS_PER_PGD 128 #define USER_PTRS_PER_PGD (TASK_SIZE/PGDIR_SIZE) +#define FIRST_USER_PGD_NR 0 /* Virtual address region for use by kernel_map() */ #define KMAP_START 0xd0000000 diff --git a/include/asm-m68k/socket.h b/include/asm-m68k/socket.h index cc27f2e32..0bd5a5315 100644 --- a/include/asm-m68k/socket.h +++ b/include/asm-m68k/socket.h @@ -39,4 +39,6 @@ #define SO_ATTACH_FILTER 26 #define SO_DETACH_FILTER 27 +#define SO_PEERNAME 28 + #endif /* _ASM_SOCKET_H */ |