Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b35a7dc authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge changes... 

Merge changes Idcbd8db9,I5ddb2036,I6cc5399e,I894482c1,Ibc95799d,I654e553d,I14599cb6,I8e6b77ce,I469602e2 into msm-next

* changes:
  arm64: mm: Log the process id in the rtb
  irq-chip: gic-v3: remove print message in irq driver
  genirq: Avoid race between cpu hot plug and irq_desc() allocation paths
  checkpatch: Use upstream commit text length checks
  kernel: rcu: Panic on RCU stall
  audit: Add option to enable/disable syscall audit
  timer: Initialize global deferrable timer
  timer: Add a global deferrable timer
  Revert "arm64: Remove unused macros from assembler.h"
parents 7c7716d1 c3c9f764

arch/arm64/include/asm/assembler.h

+12 −0
Original line number Diff line number Diff line
@@ -51,6 +51,18 @@ 
	msr	daif, \flags

	.endm



/*

 * Save/disable and restore interrupts.

 */

	.macro	save_and_disable_irqs, olddaif

	mrs	\olddaif, daif

	disable_irq

	.endm



	.macro	restore_irqs, olddaif

	msr	daif, \olddaif

	.endm



/*

 * Enable and disable debug exceptions.

 */

arch/arm64/include/asm/mmu_context.h

+7 −1
Original line number Diff line number Diff line
@@ -36,14 +36,20 @@ 
#include <asm/pgtable.h>

#include <asm/sysreg.h>

#include <asm/tlbflush.h>

#include <linux/msm_rtb.h>



static inline void contextidr_thread_switch(struct task_struct *next)

{

	pid_t pid = task_pid_nr(next);



	if (!IS_ENABLED(CONFIG_PID_IN_CONTEXTIDR))

		return;



	write_sysreg(task_pid_nr(next), contextidr_el1);

	write_sysreg(pid, contextidr_el1);

	isb();



	uncached_logk(LOGK_CTXID, (void *)(u64)pid);



}



/*

drivers/irqchip/irq-gic-v3.c

+0 −3
Original line number Diff line number Diff line
@@ -458,9 +458,6 @@ static int gic_populate_rdist(void) 
				u64 offset = ptr - gic_data.redist_regions[i].redist_base;

				gic_data_rdist_rd_base() = ptr;

				gic_data_rdist()->phys_base = gic_data.redist_regions[i].phys_base + offset;

				pr_info("CPU%d: found redistributor %lx region %d:%pa\n",

					smp_processor_id(), mpidr, i,

					&gic_data_rdist()->phys_base);

				return 0;

			}

include/linux/timer.h

+2 −0
Original line number Diff line number Diff line
@@ -198,6 +198,8 @@ extern void add_timer(struct timer_list *timer); 


extern int try_to_del_timer_sync(struct timer_list *timer);



extern struct timer_base timer_base_deferrable;



#ifdef CONFIG_SMP

  extern int del_timer_sync(struct timer_list *timer);

#else

init/Kconfig

+8 −3
Original line number Diff line number Diff line
@@ -312,15 +312,20 @@ config AUDIT 
	help

	  Enable auditing infrastructure that can be used with another

	  kernel subsystem, such as SELinux (which requires this for

	  logging of avc messages output).  System call auditing is included

	  on architectures which support it.

	  logging of avc messages output). Does not do system-call

	  auditing without CONFIG_AUDITSYSCALL.



config HAVE_ARCH_AUDITSYSCALL

	bool



config AUDITSYSCALL

	def_bool y

	bool "Enable system-call auditing support"

	depends on AUDIT && HAVE_ARCH_AUDITSYSCALL

	default y if SECURITY_SELINUX

	help

	  Enable low-overhead system-call auditing infrastructure that

	  can be used independently or with another kernel subsystem,

	  such as SELinux.



config AUDIT_WATCH

	def_bool y