diff options
| author | Luiz Souza <luiz@netgate.com> | 2018-02-19 11:29:01 -0600 |
|---|---|---|
| committer | Luiz Souza <luiz@netgate.com> | 2018-02-19 11:29:01 -0600 |
| commit | 8b4a98409db64c77fc3324f23aacf7b42b55de57 (patch) | |
| tree | ccd35477b0ba1088515ca39306fc03a57b03b440 /sys/sys | |
| parent | 045793a68906243d204d36b336867187c1a33f00 (diff) | |
| download | FreeBSD-src-8b4a98409db64c77fc3324f23aacf7b42b55de57.zip FreeBSD-src-8b4a98409db64c77fc3324f23aacf7b42b55de57.tar.gz | |
Fix a mismerge.
Diffstat (limited to 'sys/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 |
