diff options
| author | Gvozden Neskovic <[email protected]> | 2016-08-21 21:29:49 +0200 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2016-08-22 10:05:45 -0700 |
| commit | 9cc1844a1dab9cb62743f1f31eca73fcc6aaf0c4 (patch) | |
| tree | 78cb3ecc12c5dc05ac1d522542ab152e989b3d4b /include | |
| parent | 2bce8049c3d782f4feb72493564754c0595606bf (diff) | |
Linux compat: Grsecurity kernel
API Change: Module parameter set/get methods take const parameter in
Grsecurity kernel v4.7.1
Signed-off-by: Gvozden Neskovic <[email protected]>
Signed-off-by: Jason Zaman <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #4997
Closes #5001
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/Makefile.am | 3 | ||||
| -rw-r--r-- | include/linux/mod_compat.h | 39 |
2 files changed, 41 insertions, 1 deletions
diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am index 30f726892..9da9c068c 100644 --- a/include/linux/Makefile.am +++ b/include/linux/Makefile.am @@ -7,7 +7,8 @@ KERNEL_H = \ $(top_srcdir)/include/linux/blkdev_compat.h \ $(top_srcdir)/include/linux/utsname_compat.h \ $(top_srcdir)/include/linux/kmap_compat.h \ - $(top_srcdir)/include/linux/simd_x86.h + $(top_srcdir)/include/linux/simd_x86.h \ + $(top_srcdir)/include/linux/mod_compat.h USER_H = diff --git a/include/linux/mod_compat.h b/include/linux/mod_compat.h new file mode 100644 index 000000000..32aea4471 --- /dev/null +++ b/include/linux/mod_compat.h @@ -0,0 +1,39 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. + * + * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + */ + +/* + * Copyright (C) 2016 Gvozden Neskovic <[email protected]>. + */ + +#ifndef _MOD_COMPAT_H +#define _MOD_COMPAT_H + +#include <linux/module.h> +#include <linux/moduleparam.h> + +/* Grsecurity kernel API change */ +#ifdef MODULE_PARAM_CALL_CONST +typedef const struct kernel_param zfs_kernel_param_t; +#else +typedef struct kernel_param zfs_kernel_param_t; +#endif + +#endif /* _MOD_COMPAT_H */ |