diff options
| author | Luiz Souza <luiz@netgate.com> | 2018-02-23 19:38:29 -0300 |
|---|---|---|
| committer | Luiz Souza <luiz@netgate.com> | 2018-02-23 19:38:29 -0300 |
| commit | 77e2817e78b7c20d77a94256f5fcb31651001e8f (patch) | |
| tree | a6e84114b610691ccb552ff3da891317c0971c42 /sys/sys/param.h | |
| parent | 71bc802f753a5002d2eca6913c7bfdfc138fb250 (diff) | |
| download | FreeBSD-src-77e2817e78b7c20d77a94256f5fcb31651001e8f.zip FreeBSD-src-77e2817e78b7c20d77a94256f5fcb31651001e8f.tar.gz | |
Revert "Revert "MFC r322762, r322799, r322832, r322833:""
This reverts commit 5919c0a9658dde48bd090704915aa3a85a6c0d26.
Diffstat (limited to 'sys/sys/param.h')
| -rw-r--r-- | sys/sys/param.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sys/sys/param.h b/sys/sys/param.h index 16d3d6f..da63fac 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -84,7 +84,12 @@ #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_MAJOR(x) ((x) / 100000) #endif |
