diff options
| author | Luiz Souza <luiz@netgate.com> | 2018-02-23 19:44:56 -0300 |
|---|---|---|
| committer | Luiz Souza <luiz@netgate.com> | 2018-02-23 19:44:56 -0300 |
| commit | b8bedcfda33a0e7fab7a9fc796a47021422aa2b9 (patch) | |
| tree | 9c7b87dac5d28d147ce30e837733cfea000e84a6 /sys | |
| parent | 9a7a84dcaf8d6b033b724854ddcd42de5d5299f6 (diff) | |
| download | FreeBSD-src-b8bedcfda33a0e7fab7a9fc796a47021422aa2b9.zip FreeBSD-src-b8bedcfda33a0e7fab7a9fc796a47021422aa2b9.tar.gz | |
Revert "Revert "Fix a mismerge.""
This reverts commit 668c30eeaf0b27cd5fc4dd1bcea2cf9b0f3ecf65.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/sys/param.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/sys/param.h b/sys/sys/param.h index da63fac..ad25a3c 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -84,12 +84,10 @@ #define P_OSREL_SHUTDOWN_ENOTCONN 1100077 #define P_OSREL_MAP_GUARD 1200035 #define P_OSREL_MAP_GUARD_11 1101501 -<<<<<<< HEAD #define P_OSREL_MAP_GUARD_11_1 1101001 -======= #define P_OSREL_WRFSBASE 1200041 #define P_OSREL_WRFSBASE_11 1101503 ->>>>>>> b1a7a7418e7... MFC r322762, r322799, r322832, r322833: +#define P_OSREL_WRFSBASE_11_1 1101001 #define P_OSREL_MAJOR(x) ((x) / 100000) #endif |
