@@ -19,10 +19,10 @@ Subject: [PATCH 1/3] NOWRITEEXEC and PAX features: MPROTECT, EMUTRAMP

  12 files changed, 424 insertions(+)

 diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c

-index b0ff3786..e886bf8 100644

+index 045338a..778820a 100644

 --- a/arch/x86/mm/fault.c

 +++ b/arch/x86/mm/fault.c

-@@ -244,6 +244,11 @@ force_sig_info_fault(int si_signo, int si_code, unsigned long address,

+@@ -225,6 +225,11 @@ force_sig_info_fault(int si_signo, int si_code, unsigned long address,

  	force_sig_info(si_signo, &info, tsk);

  }

@@ -34,7 +34,7 @@ index b0ff3786..e886bf8 100644

  DEFINE_SPINLOCK(pgd_lock);

  LIST_HEAD(pgd_list);

-@@ -925,6 +930,13 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,

+@@ -873,6 +878,13 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,

  				return;

  		}

  #endif

@@ -48,7 +48,7 @@ index b0ff3786..e886bf8 100644

  		/*

  		 * To avoid leaking information about the kernel page table

-@@ -1531,3 +1543,209 @@ do_page_fault(struct pt_regs *regs, unsigned long error_code)

+@@ -1470,3 +1482,209 @@ do_page_fault(struct pt_regs *regs, unsigned long error_code)

  	exception_exit(prev_state);

  }

  NOKPROBE_SYMBOL(do_page_fault);

@@ -259,7 +259,7 @@ index b0ff3786..e886bf8 100644

 +}

 +#endif

 diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c

-index 73b01e4..ea8fed3 100644

+index 816cc92..058422d 100644

 --- a/fs/binfmt_elf.c

 +++ b/fs/binfmt_elf.c

 @@ -40,6 +40,7 @@

@@ -270,7 +270,7 @@ index 73b01e4..ea8fed3 100644

  #include <linux/uaccess.h>

  #include <asm/param.h>

  #include <asm/page.h>

-@@ -71,6 +72,10 @@ static int elf_core_dump(struct coredump_params *cprm);

+@@ -76,6 +77,10 @@ static int elf_core_dump(struct coredump_params *cprm);

  #define elf_core_dump	NULL

  #endif

@@ -281,7 +281,7 @@ index 73b01e4..ea8fed3 100644

  #if ELF_EXEC_PAGESIZE > PAGE_SIZE

  #define ELF_MIN_ALIGN	ELF_EXEC_PAGESIZE

  #else

-@@ -90,6 +95,9 @@ static struct linux_binfmt elf_format = {

+@@ -95,6 +100,9 @@ static struct linux_binfmt elf_format = {

  	.load_binary	= load_elf_binary,

  	.load_shlib	= load_elf_library,

  	.core_dump	= elf_core_dump,

@@ -291,7 +291,7 @@ index 73b01e4..ea8fed3 100644

  	.min_coredump	= ELF_EXEC_PAGESIZE,

  };

-@@ -859,6 +867,18 @@ static int load_elf_binary(struct linux_binprm *bprm)

+@@ -873,6 +881,18 @@ static int load_elf_binary(struct linux_binprm *bprm)

  	/* Do this immediately, since STACK_TOP as used in setup_arg_pages

  	   may depend on the personality.  */

  	SET_PERSONALITY2(loc->elf_ex, &arch_state);

@@ -310,7 +310,7 @@ index 73b01e4..ea8fed3 100644

  	if (elf_read_implies_exec(loc->elf_ex, executable_stack))

  		current->personality |= READ_IMPLIES_EXEC;

-@@ -2385,6 +2405,56 @@ out:

+@@ -2411,6 +2431,56 @@ static int elf_core_dump(struct coredump_params *cprm)

  #endif		/* CONFIG_ELF_CORE */

@@ -368,10 +368,10 @@ index 73b01e4..ea8fed3 100644

  {

  	register_binfmt(&elf_format);

 diff --git a/fs/exec.c b/fs/exec.c

-index 3e14ba2..2f6ddc2 100644

+index bdd0eac..29ae0ac 100644

 --- a/fs/exec.c

 +++ b/fs/exec.c

-@@ -744,7 +744,12 @@ int setup_arg_pages(struct linux_binprm *bprm,

+@@ -748,7 +748,12 @@ int setup_arg_pages(struct linux_binprm *bprm,

  	if (unlikely(executable_stack == EXSTACK_ENABLE_X))

  		vm_flags |= VM_EXEC;

  	else if (executable_stack == EXSTACK_DISABLE_X)

@@ -385,10 +385,10 @@ index 3e14ba2..2f6ddc2 100644

  	vm_flags |= VM_STACK_INCOMPLETE_SETUP;

 diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h

-index b0abe21..644ca30 100644

+index c05f24f..1c9133d 100644

 --- a/include/linux/binfmts.h

 +++ b/include/linux/binfmts.h

-@@ -95,6 +95,9 @@ struct linux_binfmt {

+@@ -97,6 +97,9 @@ struct linux_binfmt {

  	int (*load_binary)(struct linux_binprm *);

  	int (*load_shlib)(struct file *);

  	int (*core_dump)(struct coredump_params *cprm);

@@ -419,10 +419,10 @@ index e3649b3..c1e78a3 100644

  #endif

 diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h

-index c85f11d..9aa42c1 100644

+index a590419..fabbb8f 100644

 --- a/include/linux/mm_types.h

 +++ b/include/linux/mm_types.h

-@@ -508,6 +508,9 @@ struct mm_struct {

+@@ -487,6 +487,9 @@ struct mm_struct {

  	atomic_long_t hugetlb_usage;

  #endif

  	struct work_struct async_put_work;

@@ -433,18 +433,20 @@ index c85f11d..9aa42c1 100644

  #if IS_ENABLED(CONFIG_HMM)

  	/* HMM needs to track a few things per mm */

 diff --git a/include/linux/sched.h b/include/linux/sched.h

-index fdf74f2..3e4f9ed 100644

+index 43731fe..cc0395d4 100644

 --- a/include/linux/sched.h

 +++ b/include/linux/sched.h

-@@ -1667,4 +1667,6 @@ extern long sched_getaffinity(pid_t pid, struct cpumask *mask);

+@@ -1775,6 +1775,8 @@ extern long sched_getaffinity(pid_t pid, struct cpumask *mask);

  #define TASK_SIZE_OF(tsk)	TASK_SIZE

  #endif

 +#define MF_PAX_EMUTRAMP		0x02000000	/* Emulate trampolines */

 +

- #endif

+ #ifdef CONFIG_RSEQ

+ 

+ /*

 diff --git a/include/uapi/linux/elf.h b/include/uapi/linux/elf.h

-index c58627c..3c9eda7 100644

+index 4e12c42..5a7b624 100644

 --- a/include/uapi/linux/elf.h

 +++ b/include/uapi/linux/elf.h

 @@ -38,6 +38,7 @@ typedef __s64	Elf64_Sxword;

@@ -465,10 +467,10 @@ index c58627c..3c9eda7 100644

  #define OLD_DT_LOOS	0x60000000

  #define DT_LOOS		0x6000000d

 diff --git a/ipc/shm.c b/ipc/shm.c

-index bd65275..f6ff14a 100644

+index fefa00d..9d3dd27 100644

 --- a/ipc/shm.c

 +++ b/ipc/shm.c

-@@ -1317,6 +1317,9 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg,

+@@ -1414,6 +1414,9 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg,

  		f_mode = FMODE_READ | FMODE_WRITE;

  	}

  	if (shmflg & SHM_EXEC) {

@@ -479,10 +481,10 @@ index bd65275..f6ff14a 100644

  		acc_mode |= S_IXUGO;

  	}

 diff --git a/mm/mmap.c b/mm/mmap.c

-index 0de87a3..2aaae36 100644

+index 17bbf4d..14f7098 100644

 --- a/mm/mmap.c

 +++ b/mm/mmap.c

-@@ -1378,6 +1378,17 @@ unsigned long do_mmap(struct file *file, unsigned long addr,

+@@ -1427,6 +1427,17 @@ unsigned long do_mmap(struct file *file, unsigned long addr,

  	vm_flags |= calc_vm_prot_bits(prot, pkey) | calc_vm_flag_bits(flags) |

  			mm->def_flags | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC;

@@ -500,7 +502,7 @@ index 0de87a3..2aaae36 100644

  	if (flags & MAP_LOCKED)

  		if (!can_do_mlock())

  			return -EPERM;

-@@ -2874,6 +2885,9 @@ static int do_brk_flags(unsigned long addr, unsigned long request, unsigned long

+@@ -2936,6 +2947,9 @@ static int do_brk_flags(unsigned long addr, unsigned long len, unsigned long fla

  	if ((flags & (~VM_EXEC)) != 0)

  		return -EINVAL;

  	flags |= VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;

@@ -510,7 +512,7 @@ index 0de87a3..2aaae36 100644

  	error = get_unmapped_area(NULL, addr, len, 0, MAP_FIXED);

  	if (offset_in_page(error))

-@@ -3280,6 +3294,17 @@ static struct vm_area_struct *__install_special_mapping(

+@@ -3349,6 +3363,17 @@ static struct vm_area_struct *__install_special_mapping(

  	vma->vm_start = addr;

  	vma->vm_end = addr + len;

@@ -529,7 +531,7 @@ index 0de87a3..2aaae36 100644

  	vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);

 diff --git a/mm/mprotect.c b/mm/mprotect.c

-index ec39f73..d1a3fc3 100644

+index 6d33162..f9c0faf 100644

 --- a/mm/mprotect.c

 +++ b/mm/mprotect.c

 @@ -26,6 +26,10 @@

@@ -541,9 +543,9 @@ index ec39f73..d1a3fc3 100644

 +#include <linux/binfmts.h>

 +#endif

  #include <linux/uaccess.h>

+ #include <linux/mm_inline.h>

  #include <asm/pgtable.h>

- #include <asm/cacheflush.h>

-@@ -360,6 +364,10 @@ success:

+@@ -425,6 +429,10 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,

  	 * held in write mode.

  	 */

  	vma->vm_flags = newflags;

@@ -554,7 +556,7 @@ index ec39f73..d1a3fc3 100644

  	dirty_accountable = vma_wants_writenotify(vma, vma->vm_page_prot);

  	vma_set_page_prot(vma);

-@@ -451,6 +459,10 @@ static int do_mprotect_pkey(unsigned long start, size_t len,

+@@ -516,6 +524,10 @@ static int do_mprotect_pkey(unsigned long start, size_t len,

  	if (start > vma->vm_start)

  		prev = vma;

@@ -566,7 +568,7 @@ index ec39f73..d1a3fc3 100644

  		unsigned long mask_off_old_flags;

  		unsigned long newflags;

 diff --git a/security/Kconfig b/security/Kconfig

-index e8e4494..3cef193 100644

+index c430206..564e975 100644

 --- a/security/Kconfig

 +++ b/security/Kconfig

 @@ -4,6 +4,84 @@

@@ -654,6 +656,3 @@ index e8e4494..3cef193 100644

  source security/keys/Kconfig

  config SECURITY_DMESG_RESTRICT

-2.8.1

-

new file mode 100644

@@ -0,0 +1,106 @@

+From 4eb745c8cb5c82a2e01e407648c708de5c5a7d3e Mon Sep 17 00:00:00 2001

+From: "Srivatsa S. Bhat" <srivatsa@csail.mit.edu>

+Date: Tue, 2 Oct 2018 17:17:36 -0700

+Subject: [PATCH] bpf, ext4, bonding: Fix compilation errors

+MIME-Version: 1.0

+Content-Type: text/plain; charset=UTF-8

+Content-Transfer-Encoding: 8bit

+

+In file included from kernel/bpf/core.c:24:0:

+kernel/bpf/core.c: In function ‘___bpf_prog_run’:

+./include/linux/filter.h:750:50: error: cast from function type ‘u64 (*)(u64,  u64,  u64,  u64,  u64) {aka long long unsigned int (*)(long long unsigned int,  long long unsigned int,  long long unsigned int,  long long unsigned int,  long long unsigned int)}’ to non-matching type ‘u64 (*)(u64,  u64,  u64,  u64,  u64,  const struct bpf_insn *) {aka long long unsigned int (*)(long long unsigned int,  long long unsigned int,  long long unsigned int,  long long unsigned int,  long long unsigned int,  const struct bpf_insn *)}’

+  ((u64 (*)(u64, u64, u64, u64, u64, const struct bpf_insn *)) \

+                                                  ^

+kernel/bpf/core.c:1132:13: note: in expansion of macro ‘__bpf_call_base_args’

+   BPF_R0 = (__bpf_call_base_args + insn->imm)(BPF_R1, BPF_R2,

+             ^~~~~~~~~~~~~~~~~~~~

+kernel/bpf/core.c: In function ‘bpf_patch_call_args’:

+./include/linux/filter.h:750:50: error: cast from function type ‘u64 (*)(u64,  u64,  u64,  u64,  u64) {aka long long unsigned int (*)(long long unsigned int,  long long unsigned int,  long long unsigned int,  long long unsigned int,  long long unsigned int)}’ to non-matching type ‘u64 (*)(u64,  u64,  u64,  u64,  u64,  const struct bpf_insn *) {aka long long unsigned int (*)(long long unsigned int,  long long unsigned int,  long long unsigned int,  long long unsigned int,  long long unsigned int,  const struct bpf_insn *)}’

+  ((u64 (*)(u64, u64, u64, u64, u64, const struct bpf_insn *)) \

+                                                  ^

+kernel/bpf/core.c:1410:3: note: in expansion of macro ‘__bpf_call_base_args’

+   __bpf_call_base_args;

+   ^~~~~~~~~~~~~~~~~~~~

+

+fs/ext4/sysfs.c:349:30: error: cast from function type ‘void (*)(const void *)’ to non-matching type ‘void (*)(struct kobject *)’

+  .release = (void (*)(struct kobject *))kfree,

+                              ^~~~~~~

+

+Signed-off-by: Srivatsa S. Bhat <srivatsa@csail.mit.edu>

+---

+ drivers/gpu/drm/nouveau/Kbuild          | 2 ++

+ drivers/gpu/drm/nouveau/dispnv50/wndw.h | 4 ++--

+ fs/ext4/sysfs.c                         | 2 +-

+ include/linux/filter.h                  | 2 +-

+ include/net/bond_alb.h                  | 4 ++--

+ 5 files changed, 8 insertions(+), 6 deletions(-)

+

+diff --git a/drivers/gpu/drm/nouveau/Kbuild b/drivers/gpu/drm/nouveau/Kbuild

+index b17843d..d9a83ac 100644

+--- a/drivers/gpu/drm/nouveau/Kbuild

+@@ -62,3 +62,5 @@ nouveau-y += nv84_fence.o

+ nouveau-y += nvc0_fence.o

+ 

+ obj-$(CONFIG_DRM_NOUVEAU) += nouveau.o

++

++OBJECT_FILES_NON_STANDARD := y

+diff --git a/drivers/gpu/drm/nouveau/dispnv50/wndw.h b/drivers/gpu/drm/nouveau/dispnv50/wndw.h

+index b0b6428..0770683 100644

+--- a/drivers/gpu/drm/nouveau/dispnv50/wndw.h

+@@ -38,8 +38,8 @@ struct nv50_wndw {

+ 

+ int nv50_wndw_new_(const struct nv50_wndw_func *, struct drm_device *,

+ 		   enum drm_plane_type, const char *name, int index,

+-		   const u32 *format, enum nv50_disp_interlock_type,

+-		   u32 interlock_data, u32 heads, struct nv50_wndw **);

++		   const u32 *format, u32 heads, enum nv50_disp_interlock_type,

++		   u32 interlock_data, struct nv50_wndw **);

+ void nv50_wndw_init(struct nv50_wndw *);

+ void nv50_wndw_fini(struct nv50_wndw *);

+ void nv50_wndw_flush_set(struct nv50_wndw *, u32 *interlock,

+diff --git a/fs/ext4/sysfs.c b/fs/ext4/sysfs.c

+index b970a20..6255fe4 100644

+--- a/fs/ext4/sysfs.c

+@@ -346,7 +346,7 @@ static struct kobj_type ext4_sb_ktype = {

+ static struct kobj_type ext4_feat_ktype = {

+ 	.default_attrs	= ext4_feat_attrs,

+ 	.sysfs_ops	= &ext4_attr_ops,

+-	.release	= (void (*)(struct kobject *))kfree,

++	.release	= (void (*)(struct kobject *))((void *)kfree),

+ };

+ 

+ static struct kobject *ext4_root;

+diff --git a/include/linux/filter.h b/include/linux/filter.h

+index c73dd73..4a4a7ff 100644

+--- a/include/linux/filter.h

+@@ -748,7 +748,7 @@ void sk_filter_uncharge(struct sock *sk, struct sk_filter *fp);

+ u64 __bpf_call_base(u64 r1, u64 r2, u64 r3, u64 r4, u64 r5);

+ #define __bpf_call_base_args \

+ 	((u64 (*)(u64, u64, u64, u64, u64, const struct bpf_insn *)) \

+-	 __bpf_call_base)

++	((void *) __bpf_call_base))

+ 

+ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog);

+ void bpf_jit_compile(struct bpf_prog *prog);

+diff --git a/include/net/bond_alb.h b/include/net/bond_alb.h

+index 313a8d3..092e434 100644

+--- a/include/net/bond_alb.h

+@@ -172,8 +172,8 @@ int bond_alb_init_slave(struct bonding *bond, struct slave *slave);

+ void bond_alb_deinit_slave(struct bonding *bond, struct slave *slave);

+ void bond_alb_handle_link_change(struct bonding *bond, struct slave *slave, char link);

+ void bond_alb_handle_active_change(struct bonding *bond, struct slave *new_slave);

+-int bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev);

+-int bond_tlb_xmit(struct sk_buff *skb, struct net_device *bond_dev);

++netdev_tx_t bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev);

++netdev_tx_t bond_tlb_xmit(struct sk_buff *skb, struct net_device *bond_dev);

+ void bond_alb_monitor(struct work_struct *);

+ int bond_alb_set_mac_address(struct net_device *bond_dev, void *addr);

+ void bond_alb_clear_vlan(struct bonding *bond, unsigned short vlan_id);

+-- 

+2.7.4

+

@@ -89,7 +89,7 @@ Signed-off-by: Him Kalyan Bordoloi<bordoloih@vmware.com>

  3 files changed, 48 insertions(+), 2 deletions(-)

 diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S

-index f7bfa70..dedcbe2 100644

+index 8ae7ffd..9c1daeb 100644

 --- a/arch/x86/entry/entry_64.S

 +++ b/arch/x86/entry/entry_64.S

 @@ -53,6 +53,14 @@ ENTRY(native_usergs_sysret64)

@@ -104,22 +104,33 @@ index f7bfa70..dedcbe2 100644

 +#endif

 +.endm

 +

- .macro TRACE_IRQS_IRETQ

+ .macro TRACE_IRQS_FLAGS flags:req

  #ifdef CONFIG_TRACE_IRQFLAGS

- 	bt	$9, EFLAGS(%rsp)		/* interrupts off? */

-@@ -229,8 +237,10 @@ GLOBAL(entry_SYSCALL_64_after_hwframe)

+ 	btl	$9, \flags		/* interrupts off? */

+@@ -233,9 +241,20 @@ GLOBAL(entry_SYSCALL_64_after_hwframe)

  	TRACE_IRQS_OFF

  	/* IRQs are off. */

--	movq	%rsp, %rdi

-+	pax_rand_kstack

-+	pushq	%rdi

+-	movq	%rax, %rdi

+-	movq	%rsp, %rsi

++

++	/*

++	 * do_syscall_64 expects syscall-nr (pt_regs->orig_ax) as the first

++	 * argument (%rdi) and pointer to pt_regs as the second argument (%rsi).

++	 */

++	pushq	%rax

++	call	pax_randomize_kstack

++	popq	%rdi

++	movq    %rsp, %rsi

++	movq    %rax, %rsp

++

++	pushq	%rsi

  	call	do_syscall_64		/* returns with IRQs disabled */

 +	popq	%rsp

  	TRACE_IRQS_IRETQ		/* we're about to change IF */

-@@ -391,8 +401,11 @@ ENTRY(ret_from_fork)

+@@ -401,8 +420,11 @@ ENTRY(ret_from_fork)

  2:

  	UNWIND_HINT_REGS

@@ -133,7 +144,7 @@ index f7bfa70..dedcbe2 100644

  	jmp	swapgs_restore_regs_and_return_to_usermode

 diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c

-index 9eb448c..a6fe370 100644

+index 0091a73..a73aab3 100644

 --- a/arch/x86/kernel/process_64.c

 +++ b/arch/x86/kernel/process_64.c

 @@ -61,6 +61,23 @@

@@ -158,10 +169,10 @@ index 9eb448c..a6fe370 100644

 +#endif

 +

  /* Prints also some state that isn't saved in the pt_regs */

- void __show_regs(struct pt_regs *regs, int all)

+ void __show_regs(struct pt_regs *regs, enum show_regs_mode mode)

  {

 diff --git a/security/Kconfig b/security/Kconfig

-index f506b6b..a94f2f1 100644

+index 564e975..7ef4ec8 100644

 --- a/security/Kconfig

 +++ b/security/Kconfig

 @@ -80,6 +80,22 @@ config PAX_MPROTECT

@@ -3,7 +3,6 @@ From: Alexey Makhalov <amakhalov@vmware.com>

 Date: Fri, 3 Feb 2017 07:11:28 -0800

 Subject: [PATCH 3/3] Added rap_plugin

-Functions signature fixing is probably still required.

 ---

  arch/x86/crypto/aesni-intel_asm.S                  |  10 +-

  arch/x86/crypto/aesni-intel_glue.c                 |   4 +-

@@ -45,28 +44,12 @@ Functions signature fixing is probably still required.

  arch/x86/kernel/ftrace_64.S                        |   2 +-

  arch/x86/kernel/traps.c                            |   4 +

  arch/x86/mm/pgtable.c                              |   2 +-

- arch/x86/oprofile/nmi_int.c                        |   2 +-

  arch/x86/xen/xen-asm.S                             |   8 +-

- drivers/acpi/button.c                              |   4 +-

- drivers/acpi/ec.c                                  |   4 +-

- drivers/acpi/sysfs.c                               |   6 +-

- drivers/char/ipmi/ipmi_poweroff.c                  |   2 +-

- drivers/char/ipmi/ipmi_si_intf.c                   |   4 +-

  drivers/char/tpm/tpm-chip.c                        |   9 +-

- drivers/edac/edac_mc_sysfs.c                       |   2 +-

  drivers/firmware/dmi-id.c                          |   7 +-

  drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadow.c  |   7 +-

  .../gpu/drm/nouveau/nvkm/subdev/bios/shadowpci.c   |   7 +-

  drivers/gpu/drm/radeon/radeon_kms.c                |   4 +-

- drivers/hid/hid-magicmouse.c                       |   2 +-

- drivers/ide/ide.c                                  |   4 +-

- drivers/md/md.c                                    |   6 +-

- drivers/media/usb/uvc/uvc_driver.c                 |   4 +-

- drivers/message/fusion/mptbase.c                   |   4 +-

- drivers/misc/kgdbts.c                              |   2 +-

- drivers/mtd/devices/block2mtd.c                    |   2 +-

- drivers/mtd/devices/phram.c                        |   2 +-

- drivers/mtd/ubi/build.c                            |   2 +-

  drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c   | 216 ++++----

  drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h   |   4 +-

  drivers/net/ethernet/brocade/bna/bfa_cs.h          |  42 +-

@@ -77,12 +60,8 @@ Functions signature fixing is probably still required.

  drivers/net/ethernet/brocade/bna/bna_tx_rx.c       |   6 +-

  drivers/net/ethernet/brocade/bna/bna_types.h       |  24 +-

  drivers/net/ethernet/brocade/bna/bnad.c            |  11 +-

- drivers/pci/pcie/aspm.c                            |   4 +-

- drivers/platform/x86/thinkpad_acpi.c               |   2 +-

  drivers/ras/ras.c                                  |   2 +-

  drivers/scsi/aacraid/aachba.c                      |   7 +-

- drivers/scsi/aic7xxx/aic79xx.h                     |   2 +-

- drivers/scsi/aic7xxx/aic79xx_core.c                |  11 +-

  drivers/scsi/bfa/bfa.h                             |   4 +-

  drivers/scsi/bfa/bfa_core.c                        |   4 +-

  drivers/scsi/bfa/bfa_cs.h                          | 124 ++++-

@@ -104,46 +83,32 @@ Functions signature fixing is probably still required.

  drivers/scsi/csiostor/csio_lnode.c                 |  32 +-

  drivers/scsi/csiostor/csio_rnode.c                 |  28 +-

  drivers/scsi/csiostor/csio_scsi.c                  |  37 +-

- drivers/scsi/fcoe/fcoe_transport.c                 |  16 +-

- drivers/scsi/ipr.c                                 |  26 +-

- drivers/scsi/mpt3sas/mpt3sas_base.c                |   2 +-

- drivers/scsi/mpt3sas/mpt3sas_scsih.c               |   2 +-

- drivers/scsi/pmcraid.c                             |  26 +-

- drivers/tty/serial/kgdboc.c                        |   2 +-

- drivers/video/console/dummycon.c                   |  77 ++-

  fs/afs/file.c                                      |   8 +-

  fs/afs/internal.h                                  |   2 +-

  fs/exofs/inode.c                                   |   7 +-

  fs/fuse/file.c                                     |   4 +-

- fs/fuse/inode.c                                    |   4 +-

- fs/lockd/svc.c                                     |   2 +-

  fs/nfs/dir.c                                       |   5 +-

  fs/nfs/read.c                                      |   2 +-

  fs/nfs/symlink.c                                   |   6 +-

  fs/nfsd/nfs4xdr.c                                  | 556 ++++++++++++---------

- include/linux/compiler.h                           |  84 +---

+ include/linux/compiler.h                           |  82 ++-

+ include/linux/compiler_types.h                     |   2 +

  include/linux/linkage.h                            |  28 +-

- include/linux/moduleparam.h                        |   8 +-

+ include/linux/moduleparam.h                        |   4 +-

  include/linux/netfilter/ipset/ip_set_comment.h     |   3 +-

  include/linux/pagemap.h                            |   4 +-

  include/linux/syscalls.h                           |  18 +-

- include/linux/timer.h                              |   2 +-

- include/net/netfilter/nf_conntrack.h               |   2 +-

  kernel/bpf/core.c                                  |  15 +

  kernel/events/core.c                               |   6 +-

  kernel/module.c                                    |   9 +-

  kernel/sched/core.c                                |   4 +-

  kernel/sched/deadline.c                            |   4 +-

  kernel/sched/rt.c                                  |   4 +-

- kernel/sched/sched.h                               |   9 +-

+ kernel/sched/sched.h                               |   8 +-

  mm/filemap.c                                       |   6 +-

  mm/readahead.c                                     |   2 +-

  net/bridge/br_private.h                            |   3 +-

  net/netfilter/ipset/ip_set_core.c                  |   3 +-

- net/netfilter/nf_conntrack_core.c                  |   2 +-

- net/netfilter/nf_nat_ftp.c                         |   2 +-

- net/netfilter/nf_nat_irc.c                         |   2 +-

- net/sunrpc/svc.c                                   |   4 +-

  scripts/Makefile.gcc-plugins                       |  13 +

  scripts/gcc-plugins/rap_plugin/Makefile            |   6 +

  scripts/gcc-plugins/rap_plugin/rap.h               |  36 ++

@@ -152,8 +117,7 @@ Functions signature fixing is probably still required.

  scripts/gcc-plugins/rap_plugin/rap_plugin.c        | 534 ++++++++++++++++++++

  scripts/gcc-plugins/rap_plugin/sip.c               |  96 ++++

  security/Kconfig                                   |  18 +

- security/apparmor/lsm.c                            |  16 +-

- 148 files changed, 2659 insertions(+), 860 deletions(-)

+ 113 files changed, 2506 insertions(+), 750 deletions(-)

  create mode 100644 scripts/gcc-plugins/rap_plugin/Makefile

  create mode 100644 scripts/gcc-plugins/rap_plugin/rap.h

  create mode 100644 scripts/gcc-plugins/rap_plugin/rap_fptr_pass.c

@@ -163,28 +127,28 @@ Functions signature fixing is probably still required.

 diff --git a/arch/x86/crypto/aesni-intel_asm.S b/arch/x86/crypto/aesni-intel_asm.S

-index 12e8484..dea170b 100644

+index d27a506..25fbe8f 100644

 --- a/arch/x86/crypto/aesni-intel_asm.S

 +++ b/arch/x86/crypto/aesni-intel_asm.S

-@@ -1332,7 +1332,7 @@ _esb_loop_\@:

+@@ -1596,7 +1596,7 @@ _esb_loop_\@:

  * poly = x^128 + x^127 + x^126 + x^121 + 1

  *

  *****************************************************************************/

 -ENTRY(aesni_gcm_dec)

 +RAP_ENTRY(aesni_gcm_dec)

- 	push	%r12

- 	push	%r13

- 	push	%r14

-@@ -1595,7 +1595,7 @@ ENDPROC(aesni_gcm_dec)

+ 	FUNC_SAVE

+ 

+ 	GCM_INIT %arg6, arg7, arg8, arg9

+@@ -1684,7 +1684,7 @@ ENDPROC(aesni_gcm_dec)

  *

  * poly = x^128 + x^127 + x^126 + x^121 + 1

  ***************************************************************************/

 -ENTRY(aesni_gcm_enc)

 +RAP_ENTRY(aesni_gcm_enc)

- 	push	%r12

- 	push	%r13

- 	push	%r14

-@@ -1980,7 +1980,7 @@ ENDPROC(aesni_set_key)

+ 	FUNC_SAVE

+ 

+ 	GCM_INIT %arg6, arg7, arg8, arg9

+@@ -1952,7 +1952,7 @@ ENDPROC(aesni_set_key)

  /*

   * void aesni_enc(struct crypto_aes_ctx *ctx, u8 *dst, const u8 *src)

   */

@@ -193,7 +157,7 @@ index 12e8484..dea170b 100644

  	FRAME_BEGIN

  #ifndef __x86_64__

  	pushl KEYP

-@@ -2171,7 +2171,7 @@ ENDPROC(_aesni_enc4)

+@@ -2143,7 +2143,7 @@ ENDPROC(_aesni_enc4)

  /*

   * void aesni_dec (struct crypto_aes_ctx *ctx, u8 *dst, const u8 *src)

   */

@@ -202,7 +166,7 @@ index 12e8484..dea170b 100644

  	FRAME_BEGIN

  #ifndef __x86_64__

  	pushl KEYP

-@@ -2680,7 +2680,7 @@ ENDPROC(_aesni_inc)

+@@ -2652,7 +2652,7 @@ ENDPROC(_aesni_inc)

   * void aesni_ctr_enc(struct crypto_aes_ctx *ctx, const u8 *dst, u8 *src,

   *		      size_t len, u8 *iv)

   */

@@ -212,10 +176,10 @@ index 12e8484..dea170b 100644

  	cmp $16, LEN

  	jb .Lctr_enc_just_ret

 diff --git a/arch/x86/crypto/aesni-intel_glue.c b/arch/x86/crypto/aesni-intel_glue.c

-index c690ddc..ca0084c 100644

+index acbe7e8..8caeaee 100644

 --- a/arch/x86/crypto/aesni-intel_glue.c

 +++ b/arch/x86/crypto/aesni-intel_glue.c

-@@ -74,9 +74,9 @@ struct aesni_xts_ctx {

+@@ -89,9 +89,9 @@ struct gcm_context_data {

  asmlinkage int aesni_set_key(struct crypto_aes_ctx *ctx, const u8 *in_key,

  			     unsigned int key_len);

@@ -798,7 +762,7 @@ index 1420db1..e476cdf 100644

  	pushq	%rbx

  	pushq	%r12

 diff --git a/arch/x86/crypto/sha256-mb/sha256_mb_mgr_flush_avx2.S b/arch/x86/crypto/sha256-mb/sha256_mb_mgr_flush_avx2.S

-index 16c4ccb..2b5ffce 100644

+index d2364c5..c4e0b3a 100644

 --- a/arch/x86/crypto/sha256-mb/sha256_mb_mgr_flush_avx2.S

 +++ b/arch/x86/crypto/sha256-mb/sha256_mb_mgr_flush_avx2.S

 @@ -101,7 +101,7 @@ offset = \_offset

@@ -1130,13 +1094,13 @@ index 06fc70c..03f4755 100644

 +CFLAGS_REMOVE_syscall_32.o = $(RAP_PLUGIN_ABS_CFLAGS)

 +CFLAGS_REMOVE_syscall_64.o = $(RAP_PLUGIN_ABS_CFLAGS)

 diff --git a/arch/x86/entry/common.c b/arch/x86/entry/common.c

-index 60e21cc..0d2d08f 100644

+index 3b2490b..589aae7 100644

 --- a/arch/x86/entry/common.c

 +++ b/arch/x86/entry/common.c

-@@ -285,10 +285,30 @@ __visible void do_syscall_64(struct pt_regs *regs)

- 	 * regs->orig_ax, which changes the behavior of some syscalls.

+@@ -286,8 +286,28 @@ __visible void do_syscall_64(unsigned long nr, struct pt_regs *regs)

  	 */

- 	if (likely((nr & __SYSCALL_MASK) < NR_syscalls)) {

+ 	nr &= __SYSCALL_MASK;

+ 	if (likely(nr < NR_syscalls)) {

 +#ifdef CONFIG_PAX_RAP

 +		asm volatile("movq %[param1],%%rdi\n\t"

 +			"movq %[param2],%%rsi\n\t"

@@ -1147,7 +1111,7 @@ index 60e21cc..0d2d08f 100644

 +			"call *%P[syscall]\n\t"

 +			"mov %%rax,%[result]\n\t"

 +			: [result] "=m" (regs->ax)

-+			: [syscall] "m" (sys_call_table[nr & __SYSCALL_MASK]),

++			: [syscall] "m" (sys_call_table[nr]),

 +			[param1] "m" (regs->di),

 +			[param2] "m" (regs->si),

 +			[param3] "m" (regs->dx),

@@ -1156,15 +1120,13 @@ index 60e21cc..0d2d08f 100644

 +			[param6] "m" (regs->r9)

 +			: "ax", "di", "si", "dx", "cx", "r8", "r9", "r10", "r11", "memory");

 +#else

- 		nr = array_index_nospec(nr & __SYSCALL_MASK, NR_syscalls);

- 		regs->ax = sys_call_table[nr](

- 			regs->di, regs->si, regs->dx,

- 			regs->r10, regs->r8, regs->r9);

+ 		nr = array_index_nospec(nr, NR_syscalls);

+ 		regs->ax = sys_call_table[nr](regs);

 +#endif

  	}

  	syscall_return_slowpath(regs);

-@@ -329,10 +349,51 @@ static __always_inline void do_syscall_32_irqs_on(struct pt_regs *regs)

+@@ -331,10 +351,51 @@ static __always_inline void do_syscall_32_irqs_on(struct pt_regs *regs)

  		 * the high bits are zero.  Make sure we zero-extend all

  		 * of the args.

  		 */

@@ -1213,9 +1175,9 @@ index 60e21cc..0d2d08f 100644

  			(unsigned int)regs->dx, (unsigned int)regs->si,

  			(unsigned int)regs->di, (unsigned int)regs->bp);

 +#endif

+ #endif /* CONFIG_IA32_EMULATION */

  	}

- 	syscall_return_slowpath(regs);

 diff --git a/arch/x86/events/amd/iommu.h b/arch/x86/events/amd/iommu.h

 index 62e0702..bc87ec5 100644

 --- a/arch/x86/events/amd/iommu.h

@@ -1282,10 +1244,10 @@ index 7948a17..bc2b010 100644

 +

  #endif /* _ASM_X86_MODULE_H */

 diff --git a/arch/x86/kernel/cpu/vmware.c b/arch/x86/kernel/cpu/vmware.c

-index e05babd..da8005e 100644

+index 3aac91c..fb9d908 100644

 --- a/arch/x86/kernel/cpu/vmware.c

 +++ b/arch/x86/kernel/cpu/vmware.c

-@@ -262,11 +262,17 @@ static __init int activate_jump_labels(void)

+@@ -292,11 +292,17 @@ static __init int activate_jump_labels(void)

  }

  arch_initcall(activate_jump_labels);

@@ -1305,7 +1267,7 @@ index e05babd..da8005e 100644

  	if (vmware_tsc_khz == 0)

  		return;

 diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c

-index 71c11ad..35d8c4d 100644

+index c88c23c..7a0b8f2 100644

 --- a/arch/x86/kernel/e820.c

 +++ b/arch/x86/kernel/e820.c

 @@ -132,7 +132,7 @@ static struct e820_entry *__e820__mapped_all(u64 start, u64 end,

@@ -1318,23 +1280,23 @@ index 71c11ad..35d8c4d 100644

  	return __e820__mapped_all(start, end, type);

  }

 diff --git a/arch/x86/kernel/ftrace_64.S b/arch/x86/kernel/ftrace_64.S

-index 7cb8ba0..fd9df42 100644

+index 91b2cff..7aeca3f 100644

 --- a/arch/x86/kernel/ftrace_64.S

 +++ b/arch/x86/kernel/ftrace_64.S

-@@ -182,7 +182,7 @@ GLOBAL(ftrace_graph_call)

+@@ -186,7 +186,7 @@ GLOBAL(ftrace_graph_call)

  #endif

  /* This is weak to keep gas from relaxing the jumps */

 -WEAK(ftrace_stub)

 +RAP_WEAK(ftrace_stub)

  	retq

- END(ftrace_caller)

+ ENDPROC(ftrace_caller)

 diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c

-index a66428dc..bed821f 100644

+index e6db475..3be5161 100644

 --- a/arch/x86/kernel/traps.c

 +++ b/arch/x86/kernel/traps.c

-@@ -210,6 +210,10 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,

+@@ -211,6 +211,10 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,

  		tsk->thread.error_code = error_code;

  		tsk->thread.trap_nr = trapnr;

@@ -1346,10 +1308,10 @@ index a66428dc..bed821f 100644

  	}

 diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c

-index 004abf9..9db5ce3 100644

+index e3deefb..3b375e1 100644

 --- a/arch/x86/mm/pgtable.c

 +++ b/arch/x86/mm/pgtable.c

-@@ -580,7 +580,7 @@ void __native_set_fixmap(enum fixed_addresses idx, pte_t pte)

+@@ -585,7 +585,7 @@ void __native_set_fixmap(enum fixed_addresses idx, pte_t pte)

  	fixmaps_set++;

  }

@@ -1357,20 +1319,7 @@ index 004abf9..9db5ce3 100644

 +void native_set_fixmap(unsigned int idx, phys_addr_t phys,

  		       pgprot_t flags)

  {

- 	__native_set_fixmap(idx, pfn_pte(phys >> PAGE_SHIFT, flags));

-diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c

-index abff76b..a7a7677 100644

-+++ b/arch/x86/oprofile/nmi_int.c

-@@ -592,7 +592,7 @@ enum __force_cpu_type {

- 

- static int force_cpu_type;

- 

--static int set_cpu_type(const char *str, struct kernel_param *kp)

-+static int set_cpu_type(const char *str, const struct kernel_param *kp)

- {

- 	if (!strcmp(str, "timer")) {

- 		force_cpu_type = timer;

+ 	/* Sanitize 'prot' against any unsupported bits: */

 diff --git a/arch/x86/xen/xen-asm.S b/arch/x86/xen/xen-asm.S

 index 8019edd..1ce2907 100644

 --- a/arch/x86/xen/xen-asm.S

@@ -1411,121 +1360,11 @@ index 8019edd..1ce2907 100644

  	FRAME_BEGIN

  #ifdef CONFIG_X86_64

  	testw $X86_EFLAGS_IF, %di

-diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c

-index ef1856b..efcd68a 100644

-+++ b/drivers/acpi/button.c

-@@ -557,7 +557,7 @@ static int acpi_button_remove(struct acpi_device *device)

- 	return 0;

- }

- 

--static int param_set_lid_init_state(const char *val, struct kernel_param *kp)

-+static int param_set_lid_init_state(const char *val, const struct kernel_param *kp)

- {

- 	int result = 0;

- 

-@@ -575,7 +575,7 @@ static int param_set_lid_init_state(const char *val, struct kernel_param *kp)

- 	return result;

- }

- 

--static int param_get_lid_init_state(char *buffer, struct kernel_param *kp)

-+static int param_get_lid_init_state(char *buffer, const struct kernel_param *kp)

- {

- 	switch (lid_init_state) {

- 	case ACPI_BUTTON_LID_INIT_OPEN:

-diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c

-index df84246..2c4c0e9 100644

-+++ b/drivers/acpi/ec.c

-@@ -1956,7 +1956,7 @@ static const struct dev_pm_ops acpi_ec_pm = {

- 	SET_SYSTEM_SLEEP_PM_OPS(acpi_ec_suspend, acpi_ec_resume)

- };

- 

--static int param_set_event_clearing(const char *val, struct kernel_param *kp)

-+static int param_set_event_clearing(const char *val, const struct kernel_param *kp)

- {

- 	int result = 0;

- 

-@@ -1974,7 +1974,7 @@ static int param_set_event_clearing(const char *val, struct kernel_param *kp)

- 	return result;

- }

- 

--static int param_get_event_clearing(char *buffer, struct kernel_param *kp)

-+static int param_get_event_clearing(char *buffer, const struct kernel_param *kp)

- {

- 	switch (ec_event_clearing) {

- 	case ACPI_EC_EVT_TIMING_STATUS:

-diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c

-index 0fd57bf..4307ad7 100644

-+++ b/drivers/acpi/sysfs.c

-@@ -230,7 +230,7 @@ module_param_cb(trace_method_name, &param_ops_trace_method, &trace_method_name,

- module_param_cb(trace_debug_layer, &param_ops_trace_attrib, &acpi_gbl_trace_dbg_layer, 0644);

- module_param_cb(trace_debug_level, &param_ops_trace_attrib, &acpi_gbl_trace_dbg_level, 0644);

- 

--static int param_set_trace_state(const char *val, struct kernel_param *kp)

-+static int param_set_trace_state(const char *val, const struct kernel_param *kp)

- {

- 	acpi_status status;

- 	const char *method = trace_method_name;

-@@ -266,7 +266,7 @@ static int param_set_trace_state(const char *val, struct kernel_param *kp)

- 	return 0;

- }

- 

--static int param_get_trace_state(char *buffer, struct kernel_param *kp)

-+static int param_get_trace_state(char *buffer, const struct kernel_param *kp)

- {

- 	if (!(acpi_gbl_trace_flags & ACPI_TRACE_ENABLED))

- 		return sprintf(buffer, "disable");

-@@ -295,7 +295,7 @@ MODULE_PARM_DESC(aml_debug_output,

- 		 "To enable/disable the ACPI Debug Object output.");

- 

- /* /sys/module/acpi/parameters/acpica_version */

--static int param_get_acpica_version(char *buffer, struct kernel_param *kp)

-+static int param_get_acpica_version(char *buffer, const struct kernel_param *kp)

- {

- 	int result;

- 

-diff --git a/drivers/char/ipmi/ipmi_poweroff.c b/drivers/char/ipmi/ipmi_poweroff.c

-index 9f2e3be..676c910 100644

-+++ b/drivers/char/ipmi/ipmi_poweroff.c

-@@ -66,7 +66,7 @@ static void (*specific_poweroff_func)(ipmi_user_t user);

- /* Holds the old poweroff function so we can restore it on removal. */

- static void (*old_poweroff_func)(void);

- 

--static int set_param_ifnum(const char *val, struct kernel_param *kp)

-+static int set_param_ifnum(const char *val, const struct kernel_param *kp)

- {

- 	int rv = param_set_int(val, kp);

- 	if (rv)

-diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c

-index c04aa11..9abc067 100644

-+++ b/drivers/char/ipmi/ipmi_si_intf.c

-@@ -1345,7 +1345,7 @@ static unsigned int num_slave_addrs;

- #define IPMI_MEM_ADDR_SPACE 1

- static const char * const addr_space_to_str[] = { "i/o", "mem" };

- 

--static int hotmod_handler(const char *val, struct kernel_param *kp);

-+static int hotmod_handler(const char *val, const struct kernel_param *kp);

- 

- module_param_call(hotmod, hotmod_handler, NULL, NULL, 0200);

- MODULE_PARM_DESC(hotmod, "Add and remove interfaces.  See"

-@@ -1811,7 +1811,7 @@ static struct smi_info *smi_info_alloc(void)

- 	return info;

- }

- 

--static int hotmod_handler(const char *val, struct kernel_param *kp)

-+static int hotmod_handler(const char *val, const struct kernel_param *kp)

- {

- 	char *str = kstrdup(val, GFP_KERNEL);

- 	int  rv;

 diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c

-index 0eca20c..32a2682 100644

+index 0a62c19..95a2708 100644

 --- a/drivers/char/tpm/tpm-chip.c

 +++ b/drivers/char/tpm/tpm-chip.c

-@@ -267,6 +267,11 @@ struct tpm_chip *tpm_chip_alloc(struct device *pdev,

+@@ -272,6 +272,11 @@ struct tpm_chip *tpm_chip_alloc(struct device *pdev,

  }

  EXPORT_SYMBOL_GPL(tpm_chip_alloc);

@@ -1537,7 +1376,7 @@ index 0eca20c..32a2682 100644

  /**

   * tpmm_chip_alloc() - allocate a new struct tpm_chip instance

   * @pdev: parent device to which the chip is associated

-@@ -284,9 +289,7 @@ struct tpm_chip *tpmm_chip_alloc(struct device *pdev,

+@@ -289,9 +294,7 @@ struct tpm_chip *tpmm_chip_alloc(struct device *pdev,

  	if (IS_ERR(chip))

  		return chip;

@@ -1548,24 +1387,11 @@ index 0eca20c..32a2682 100644

  	if (rc)

  		return ERR_PTR(rc);

-diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c

-index e4fcfa8..c70ea82 100644

-+++ b/drivers/edac/edac_mc_sysfs.c

-@@ -50,7 +50,7 @@ int edac_mc_get_poll_msec(void)

- 	return edac_mc_poll_msec;

- }

- 

--static int edac_set_poll_msec(const char *val, struct kernel_param *kp)

-+static int edac_set_poll_msec(const char *val, const struct kernel_param *kp)

- {

- 	unsigned long l;

- 	int ret;

 diff --git a/drivers/firmware/dmi-id.c b/drivers/firmware/dmi-id.c

-index 951b6c7..13563a9 100644

+index 624a11c..3ddff56 100644

 --- a/drivers/firmware/dmi-id.c

 +++ b/drivers/firmware/dmi-id.c

-@@ -160,9 +160,14 @@ static int dmi_dev_uevent(struct device *dev, struct kobj_uevent_env *env)

+@@ -161,9 +161,14 @@ static int dmi_dev_uevent(struct device *dev, struct kobj_uevent_env *env)

  	return 0;

  }

@@ -1626,10 +1452,10 @@ index 9b91da0..b3fa90d 100644

  	.rw = true,

  };