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-sparc64 | |
| parent | d5c9a365ee7d2fded249aa5abfc5e89587583029 (diff) | |
Merge with Linux 2.3.49.
Diffstat (limited to 'include/asm-sparc64')
| -rw-r--r-- | include/asm-sparc64/pgtable.h | 1 | ||||
| -rw-r--r-- | include/asm-sparc64/socket.h | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/asm-sparc64/pgtable.h b/include/asm-sparc64/pgtable.h index 8bb88ee49..b271dad95 100644 --- a/include/asm-sparc64/pgtable.h +++ b/include/asm-sparc64/pgtable.h @@ -51,6 +51,7 @@ /* Kernel has a separate 44bit address space. */ #define USER_PTRS_PER_PGD ((const int)((current->thread.flags & SPARC_FLAG_32BIT) ? \ (1) : (PTRS_PER_PGD))) +#define FIRST_USER_PGD_NR 0 #define PTE_TABLE_SIZE 0x2000 /* 1024 entries 8 bytes each */ #define PMD_TABLE_SIZE 0x2000 /* 2048 entries 4 bytes each */ diff --git a/include/asm-sparc64/socket.h b/include/asm-sparc64/socket.h index 0f25b82c1..644f064b0 100644 --- a/include/asm-sparc64/socket.h +++ b/include/asm-sparc64/socket.h @@ -1,4 +1,4 @@ -/* $Id: socket.h,v 1.5 1998/07/22 22:06:49 davem Exp $ */ +/* $Id: socket.h,v 1.6 2000/02/27 19:47:58 davem Exp $ */ #ifndef _ASM_SOCKET_H #define _ASM_SOCKET_H @@ -40,6 +40,8 @@ #define SO_ATTACH_FILTER 0x001a #define SO_DETACH_FILTER 0x001b +#define SO_PEERNAME 0x001c + /* Security levels - as per NRL IPv6 - don't actually do anything */ #define SO_SECURITY_AUTHENTICATION 0x5001 #define SO_SECURITY_ENCRYPTION_TRANSPORT 0x5002 |