linux: remove deprecated 4.6 support

8 files changed, 2 insertions, 26678 deletions

diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel
index 843929376..5c8c84f30 100644
--- a/target/linux/config/Config.in.kernel
+++ b/target/linux/config/Config.in.kernel
@@ -142,8 +142,7 @@ config ADK_KERNEL_PREEMPT_RTB
 	select ADK_KERNEL_HIGH_RES_TIMERS
 	select ADK_KERNEL_PATCH_REALTIME
 	depends on ADK_TARGET_KERNEL_VERSION_4_1 \
-		|| ADK_TARGET_KERNEL_VERSION_4_4 \
-		|| ADK_TARGET_KERNEL_VERSION_4_6
+		|| ADK_TARGET_KERNEL_VERSION_4_4
         help
 	  Preemptible Kernel (Basic RT)
 
@@ -152,8 +151,7 @@ config ADK_KERNEL_PREEMPT_RT_FULL
 	select ADK_KERNEL_HIGH_RES_TIMERS
 	select ADK_KERNEL_PATCH_REALTIME
 	depends on ADK_TARGET_KERNEL_VERSION_4_1 \
-		|| ADK_TARGET_KERNEL_VERSION_4_4 \
-		|| ADK_TARGET_KERNEL_VERSION_4_6
+		|| ADK_TARGET_KERNEL_VERSION_4_4
         help
 	  Fully Preemptible Kernel (RealTime)
 	  https://www.kernel.org/pub/linux/kernel/projects/rt/
diff --git a/target/linux/patches/4.6.6/crisv32.patch b/target/linux/patches/4.6.6/crisv32.patch
deleted file mode 100644
index cb9b0d028..000000000
--- a/target/linux/patches/4.6.6/crisv32.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Nur linux-4.4.13.orig/arch/cris/arch-v32/mm/intmem.c linux-4.4.13/arch/cris/arch-v32/mm/intmem.c
---- linux-4.4.13.orig/arch/cris/arch-v32/mm/intmem.c	2016-06-08 03:14:51.000000000 +0200
-+++ linux-4.4.13/arch/cris/arch-v32/mm/intmem.c	2016-06-21 20:40:18.919361891 +0200
-@@ -113,14 +113,14 @@
- 
- 			allocation->status = STATUS_FREE;
- 			/* Join with prev and/or next if also free */
--			if ((prev != &intmem_allocations) &&
-+			if ((&prev->entry != &intmem_allocations) &&
- 					(prev->status == STATUS_FREE)) {
- 				prev->size += allocation->size;
- 				list_del(&allocation->entry);
- 				kfree(allocation);
- 				allocation = prev;
- 			}
--			if ((next != &intmem_allocations) &&
-+			if ((&next->entry != &intmem_allocations) &&
- 					(next->status == STATUS_FREE)) {
- 				allocation->size += next->size;
- 				list_del(&next->entry);
-@@ -145,5 +145,11 @@
- 		(unsigned long)intmem_virtual + MEM_INTMEM_START +
- 		RESERVED_SIZE);
- }
--device_initcall(crisv32_intmem_init);
- 
-+static int __init crisv32_intmem_setup(void)
-+{
-+	crisv32_intmem_init();
-+
-+	return 0;
-+}
-+device_initcall(crisv32_intmem_setup);
diff --git a/target/linux/patches/4.6.6/initramfs-nosizelimit.patch b/target/linux/patches/4.6.6/initramfs-nosizelimit.patch
deleted file mode 100644
index 40d2f6bd8..000000000
--- a/target/linux/patches/4.6.6/initramfs-nosizelimit.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 9a18df7a71bfa620b1278777d64783a359d7eb4e Mon Sep 17 00:00:00 2001
-From: Thorsten Glaser <tg@mirbsd.org>
-Date: Sun, 4 May 2014 01:37:54 +0200
-Subject: [PATCH] mount tmpfs-as-rootfs (initramfs) with -o
- nr_blocks=0,nr_inodes=0
-
-I would have preferred to write this patch to be able to pass
-rootflags=nr_blocks=0,nr_inodes=0 on the kernel command line,
-and then hand these rootflags over to the initramfs (tmpfs)
-mount in the same way the kernel hands them over to the block
-device rootfs mount. But at least the Debian/m68k initrd also
-parses $rootflags from the environment and adds it to the call
-to the user-space mount for the eventual root device, which
-would make the kernel command line rootflags option be used in
-both places (tmpfs and e.g. ext4) which is guaranteed to error
-out in at least one of them.
-
-This change is intended to aid people in a setup where the
-initrd is the final root filesystem, i.e. not mounted over.
-This is especially useful in automated tests running on qemu
-for boards with constrained memory (e.g. 64 MiB on sh4).
-
-Considering that the initramfs is normally emptied out then
-overmounted, this change is probably safe for setups where
-initramfs just hosts early userspace, too, since the tmpfs
-backing it is not accessible any more later on, AFAICT.
-
-Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
----
- init/do_mounts.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/init/do_mounts.c b/init/do_mounts.c
-index 82f2288..55a4cfe 100644
---- a/init/do_mounts.c
-+++ b/init/do_mounts.c
-@@ -594,6 +594,7 @@ out:
- }
- 
- static bool is_tmpfs;
-+static char tmpfs_rootflags[] = "nr_blocks=0,nr_inodes=0";
- static struct dentry *rootfs_mount(struct file_system_type *fs_type,
- 	int flags, const char *dev_name, void *data)
- {
-@@ -606,6 +607,9 @@ static struct dentry *rootfs_mount(struct file_system_type *fs_type,
- 	if (IS_ENABLED(CONFIG_TMPFS) && is_tmpfs)
- 		fill = shmem_fill_super;
- 
-+	if (is_tmpfs)
-+		data = tmpfs_rootflags;
-+
- 	return mount_nodev(fs_type, flags, data, fill);
- }
- 
--- 
-2.0.0.rc0
-
diff --git a/target/linux/patches/4.6.6/ld-or1k.patch b/target/linux/patches/4.6.6/ld-or1k.patch
deleted file mode 100644
index 264f9166f..000000000
--- a/target/linux/patches/4.6.6/ld-or1k.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur linux-4.4.5.orig/arch/openrisc/kernel/vmlinux.lds.S linux-4.4.5/arch/openrisc/kernel/vmlinux.lds.S
---- linux-4.4.5.orig/arch/openrisc/kernel/vmlinux.lds.S	2016-03-10 00:35:58.000000000 +0100
-+++ linux-4.4.5/arch/openrisc/kernel/vmlinux.lds.S	2016-03-16 09:21:07.933535532 +0100
-@@ -30,7 +30,7 @@
- #include <asm/cache.h>
- #include <asm-generic/vmlinux.lds.h>
- 
--OUTPUT_FORMAT("elf32-or32", "elf32-or32", "elf32-or32")
-+OUTPUT_FORMAT("elf32-or1k", "elf32-or1k", "elf32-or1k")
- jiffies = jiffies_64 + 4;
- 
- SECTIONS
diff --git a/target/linux/patches/4.6.6/macsonic.patch b/target/linux/patches/4.6.6/macsonic.patch
deleted file mode 100644
index 75a6fcad2..000000000
--- a/target/linux/patches/4.6.6/macsonic.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur linux-4.4.6.orig/drivers/net/ethernet/natsemi/Kconfig linux-4.4.6/drivers/net/ethernet/natsemi/Kconfig
---- linux-4.4.6.orig/drivers/net/ethernet/natsemi/Kconfig	2016-03-16 16:43:17.000000000 +0100
-+++ linux-4.4.6/drivers/net/ethernet/natsemi/Kconfig	2016-03-18 10:43:34.000000000 +0100
-@@ -18,6 +18,7 @@
- config MACSONIC
- 	tristate "Macintosh SONIC based ethernet (onboard, NuBus, LC, CS)"
- 	depends on MAC
-+	select BITREVERSE
- 	---help---
- 	  Support for NatSemi SONIC based Ethernet devices.  This includes
- 	  the onboard Ethernet in many Quadras as well as some LC-PDS,
diff --git a/target/linux/patches/4.6.6/patch-realtime b/target/linux/patches/4.6.6/patch-realtime
deleted file mode 100644
index dbaa94b0a..000000000
--- a/target/linux/patches/4.6.6/patch-realtime
+++ /dev/null
@@ -1,26232 +0,0 @@
-diff -Nur linux-4.6.6.orig/arch/arm/include/asm/switch_to.h linux-4.6.6/arch/arm/include/asm/switch_to.h
---- linux-4.6.6.orig/arch/arm/include/asm/switch_to.h	2016-08-10 12:54:57.000000000 +0200
-+++ linux-4.6.6/arch/arm/include/asm/switch_to.h	2016-08-22 21:27:46.269819745 +0200
-@@ -3,6 +3,13 @@
- 
- #include <linux/thread_info.h>
- 
-+#if defined CONFIG_PREEMPT_RT_FULL && defined CONFIG_HIGHMEM
-+void switch_kmaps(struct task_struct *prev_p, struct task_struct *next_p);
-+#else
-+static inline void
-+switch_kmaps(struct task_struct *prev_p, struct task_struct *next_p) { }
-+#endif
-+
- /*
-  * For v7 SMP cores running a preemptible kernel we may be pre-empted
-  * during a TLB maintenance operation, so execute an inner-shareable dsb
-@@ -25,6 +32,7 @@
- #define switch_to(prev,next,last)					\
- do {									\
- 	__complete_pending_tlbi();					\
-+	switch_kmaps(prev, next);					\
- 	last = __switch_to(prev,task_thread_info(prev), task_thread_info(next));	\
- } while (0)
- 
-diff -Nur linux-4.6.6.orig/arch/arm/include/asm/thread_info.h linux-4.6.6/arch/arm/include/asm/thread_info.h
---- linux-4.6.6.orig/arch/arm/include/asm/thread_info.h	2016-08-10 12:54:57.000000000 +0200
-+++ linux-4.6.6/arch/arm/include/asm/thread_info.h	2016-08-22 21:27:46.269819745 +0200
-@@ -49,6 +49,7 @@
- struct thread_info {
- 	unsigned long		flags;		/* low level flags */
- 	int			preempt_count;	/* 0 => preemptable, <0 => bug */
-+	int			preempt_lazy_count; /* 0 => preemptable, <0 => bug */
- 	mm_segment_t		addr_limit;	/* address limit */
- 	struct task_struct	*task;		/* main task structure */
- 	__u32			cpu;		/* cpu */
-@@ -142,7 +143,8 @@
- #define TIF_SYSCALL_TRACE	4	/* syscall trace active */
- #define TIF_SYSCALL_AUDIT	5	/* syscall auditing active */
- #define TIF_SYSCALL_TRACEPOINT	6	/* syscall tracepoint instrumentation */
--#define TIF_SECCOMP		7	/* seccomp syscall filtering active */
-+#define TIF_SECCOMP		8	/* seccomp syscall filtering active */
-+#define TIF_NEED_RESCHED_LAZY	7
- 
- #define TIF_NOHZ		12	/* in adaptive nohz mode */
- #define TIF_USING_IWMMXT	17
-@@ -152,6 +154,7 @@
- #define _TIF_SIGPENDING		(1 << TIF_SIGPENDING)
- #define _TIF_NEED_RESCHED	(1 << TIF_NEED_RESCHED)
- #define _TIF_NOTIFY_RESUME	(1 << TIF_NOTIFY_RESUME)
-+#define _TIF_NEED_RESCHED_LAZY	(1 << TIF_NEED_RESCHED_LAZY)
- #define _TIF_UPROBE		(1 << TIF_UPROBE)
- #define _TIF_SYSCALL_TRACE	(1 << TIF_SYSCALL_TRACE)
- #define _TIF_SYSCALL_AUDIT	(1 << TIF_SYSCALL_AUDIT)
-@@ -167,7 +170,8 @@
-  * Change these and you break ASM code in entry-common.S
-  */
- #define _TIF_WORK_MASK		(_TIF_NEED_RESCHED | _TIF_SIGPENDING | \
--				 _TIF_NOTIFY_RESUME | _TIF_UPROBE)
-+				 _TIF_NOTIFY_RESUME | _TIF_UPROBE | \
-+				 _TIF_NEED_RESCHED_LAZY)
- 
- #endif /* __KERNEL__ */
- #endif /* __ASM_ARM_THREAD_INFO_H */
-diff -Nur linux-4.6.6.orig/arch/arm/Kconfig linux-4.6.6/arch/arm/Kconfig
---- linux-4.6.6.orig/arch/arm/Kconfig	2016-08-10 12:54:57.000000000 +0200
-+++ linux-4.6.6/arch/arm/Kconfig	2016-08-22 21:27:46.261819236 +0200
-@@ -35,7 +35,7 @@
- 	select HARDIRQS_SW_RESEND
- 	select HAVE_ARCH_AUDITSYSCALL if (AEABI && !OABI_COMPAT)
- 	select HAVE_ARCH_BITREVERSE if (CPU_32v7M || CPU_32v7) && !CPU_32v6
--	select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL && !CPU_ENDIAN_BE32 && MMU
-+	select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL && !CPU_ENDIAN_BE32 && MMU && !PREEMPT_RT_BASE
- 	select HAVE_ARCH_KGDB if !CPU_ENDIAN_BE32 && MMU
- 	select HAVE_ARCH_MMAP_RND_BITS if MMU
- 	select HAVE_ARCH_SECCOMP_FILTER if (AEABI && !OABI_COMPAT)
-@@ -71,6 +71,7 @@
- 	select HAVE_PERF_EVENTS
- 	select HAVE_PERF_REGS
- 	select HAVE_PERF_USER_STACK_DUMP
-+	select HAVE_PREEMPT_LAZY
- 	select HAVE_RCU_TABLE_FREE if (SMP && ARM_LPAE)
- 	select HAVE_REGS_AND_STACK_ACCESS_API
- 	select HAVE_SYSCALL_TRACEPOINTS
-diff -Nur linux-4.6.6.orig/arch/arm/kernel/asm-offsets.c linux-4.6.6/arch/arm/kernel/asm-offsets.c
---- linux-4.6.6.orig/arch/arm/kernel/asm-offsets.c	2016-08-10 12:54:57.000000000 +0200
-+++ linux-4.6.6/arch/arm/kernel/asm-offsets.c	2016-08-22 21:27:46.293821284 +0200
-@@ -65,6 +65,7 @@
-   BLANK();
-   DEFINE(TI_FLAGS,		offsetof(struct thread_info, flags));
-   DEFINE(TI_PREEMPT,		offsetof(struct thread_info, preempt_count));
-+  DEFINE(TI_PREEMPT_LAZY,	offsetof(struct thread_info, preempt_lazy_count));
-   DEFINE(TI_ADDR_LIMIT,		offsetof(struct thread_info, addr_limit));
-   DEFINE(TI_TASK,		offsetof(struct thread_info, task));
-   DEFINE(TI_CPU,		offsetof(struct thread_info, cpu));
-diff -Nur linux-4.6.6.orig/arch/arm/kernel/entry-armv.S linux-4.6.6/arch/arm/kernel/entry-armv.S
---- linux-4.6.6.orig/arch/arm/kernel/entry-armv.S	2016-08-10 12:54:57.000000000 +0200
-+++ linux-4.6.6/arch/arm/kernel/entry-armv.S	2016-08-22 21:27:46.305822058 +0200
-@@ -215,11 +215,18 @@
- #ifdef CONFIG_PREEMPT
- 	get_thread_info tsk
- 	ldr	r8, [tsk, #TI_PREEMPT]		@ get preempt count
--	ldr	r0, [tsk, #TI_FLAGS]		@ get flags
- 	teq	r8, #0				@ if preempt count != 0
-+	bne	1f				@ return from exeption
-+	ldr	r0, [tsk, #TI_FLAGS]		@ get flags
-+	tst	r0, #_TIF_NEED_RESCHED		@ if NEED_RESCHED is set
-+	blne	svc_preempt			@ preempt!
-+
-+	ldr	r8, [tsk, #TI_PREEMPT_LAZY]	@ get preempt lazy count
-+	teq	r8, #0				@ if preempt lazy count != 0
- 	movne	r0, #0				@ force flags to 0
--	tst	r0, #_TIF_NEED_RESCHED
-+	tst	r0, #_TIF_NEED_RESCHED_LAZY
- 	blne	svc_preempt
-+1:
- #endif
- 
- 	svc_exit r5, irq = 1			@ return from exception
-@@ -234,8 +241,14 @@
- 1:	bl	preempt_schedule_irq		@ irq en/disable is done inside
- 	ldr	r0, [tsk, #TI_FLAGS]		@ get new tasks TI_FLAGS
- 	tst	r0, #_TIF_NEED_RESCHED
-+	bne	1b
-+	tst	r0, #_TIF_NEED_RESCHED_LAZY
- 	reteq	r8				@ go again
--	b	1b
-+	ldr	r0, [tsk, #TI_PREEMPT_LAZY]	@ get preempt lazy count
-+	teq	r0, #0				@ if preempt lazy count != 0
-+	beq	1b
-+	ret	r8				@ go again
-+
- #endif
- 
- __und_fault:
-diff -Nur linux-4.6.6.orig/arch/arm/kernel/entry-common.S linux-4.6.6/arch/arm/kernel/entry-common.S
---- linux-4.6.6.orig/arch/arm/kernel/entry-common.S	2016-08-10 12:54:57.000000000 +0200
-+++ linux-4.6.6/arch/arm/kernel/entry-common.S	2016-08-22 21:27:46.305822058 +0200
-@@ -36,7 +36,9 @@
-  UNWIND(.cantunwind	)
- 	disable_irq_notrace			@ disable interrupts
- 	ldr	r1, [tsk, #TI_FLAGS]		@ re-check for syscall tracing
--	tst	r1, #_TIF_SYSCALL_WORK | _TIF_WORK_MASK
-+	tst	r1, #((_TIF_SYSCALL_WORK | _TIF_WORK_MASK) & ~_TIF_SECCOMP)
-+	bne	fast_work_pending
-+	tst	r1, #_TIF_SECCOMP
- 	bne	fast_work_pending
- 
- 	/* perform architecture specific actions before user return */
-@@ -62,8 +64,11 @@
- 	str	r0, [sp, #S_R0 + S_OFF]!	@ save returned r0
- 	disable_irq_notrace			@ disable interrupts
- 	ldr	r1, [tsk, #TI_FLAGS]		@ re-check for syscall tracing
--	tst	r1, #_TIF_SYSCALL_WORK | _TIF_WORK_MASK
-+	tst	r1, #((_TIF_SYSCALL_WORK | _TIF_WORK_MASK) & ~_TIF_SECCOMP)
-+	bne 	do_slower_path
-+	tst	r1, #_TIF_SECCOMP
- 	beq	no_work_pending
-+do_slower_path:
-  UNWIND(.fnend		)
- ENDPROC(ret_fast_syscall)
- 
-diff -Nur linux-4.6.6.orig/arch/arm/kernel/process.c linux-4.6.6/arch/arm/kernel/process.c
---- linux-4.6.6.orig/arch/arm/kernel/process.c	2016-08-10 12:54:57.000000000 +0200
-+++ linux-4.6.6/arch/arm/kernel/process.c	2016-08-22 21:27:46.313822571 +0200
-@@ -319,6 +319,30 @@
- }
- 
- #ifdef CONFIG_MMU
-+/*
-+ * CONFIG_SPLIT_PTLOCK_CPUS results in a page->ptl lock.  If the lock is not
-+ * initialized by pgtable_page_ctor() then a coredump of the vector page will
-+ * fail.
-+ */
-+static int __init vectors_user_mapping_init_page(void)
-+{
-+	struct page *page;
-+	unsigned long addr = 0xffff0000;
-+	pgd_t *pgd;
-+	pud_t *pud;
-+	pmd_t *pmd;
-+
-+	pgd = pgd_offset_k(addr);
-+	pud = pud_offset(pgd, addr);
-+	pmd = pmd_offset(pud, addr);
-+	page = pmd_page(*(pmd));
-+
-+	pgtable_page_ctor(page);
-+
-+	return 0;
-+}
-+late_initcall(vectors_user_mapping_init_page);
-+
- #ifdef CONFIG_KUSER_HELPERS
- /*
-  * The vectors page is always readable from user space for the
-diff -Nur linux-4.6.6.orig/arch/arm/kernel/signal.c linux-4.6.6/arch/arm/kernel/signal.c
---- linux-4.6.6.orig/arch/arm/kernel/signal.c	2016-08-10 12:54:57.000000000 +0200
-+++ linux-4.6.6/arch/arm/kernel/signal.c	2016-08-22 21:27:46.313822571 +0200
-@@ -572,7 +572,8 @@
- 	 */
- 	trace_hardirqs_off();
- 	do {
--		if (likely(thread_flags & _TIF_NEED_RESCHED)) {
-+		if (likely(thread_flags & (_TIF_NEED_RESCHED |
-+					   _TIF_NEED_RESCHED_LAZY))) {
- 			schedule();
- 		} else {
- 			if (unlikely(!user_mode(regs)))
-diff -Nur linux-4.6.6.orig/arch/arm/kernel/smp.c linux-4.6.6/arch/arm/kernel/smp.c
---- linux-4.6.6.orig/arch/arm/kernel/smp.c	2016-08-10 12:54:57.000000000 +0200
-+++ linux-4.6.6/arch/arm/kernel/smp.c	2016-08-22 21:27:46.313822571 +0200
-@@ -234,8 +234,6 @@
- 	flush_cache_louis();
- 	local_flush_tlb_all();
- 
--	clear_tasks_mm_cpumask(cpu);
--
- 	return 0;
- }
- 
-@@ -251,6 +249,9 @@
- 		pr_err("CPU%u: cpu didn't die\n", cpu);
- 		return;
- 	}
-+
-+	clear_tasks_mm_cpumask(cpu);
-+
- 	pr_notice("CPU%u: shutdown\n", cpu);
- 
- 	/*
-diff -Nur linux-4.6.6.orig/arch/arm/kernel/unwind.c linux-4.6.6/arch/arm/kernel/unwind.c
---- linux-4.6.6.orig/arch/arm/kernel/unwind.c	2016-08-10 12:54:57.000000000 +0200
-+++ linux-4.6.6/arch/arm/kernel/unwind.c	2016-08-22 21:27:46.317822824 +0200
-@@ -93,7 +93,7 @@
- static const struct unwind_idx *__origin_unwind_idx;
- extern const struct unwind_idx __stop_unwind_idx[];
- 
--static DEFINE_SPINLOCK(unwind_lock);
-+static DEFINE_RAW_SPINLOCK(unwind_lock);
- static LIST_HEAD(unwind_tables);
- 
- /* Convert a prel31 symbol to an absolute address */
-@@ -201,7 +201,7 @@
- 		/* module unwind tables */
- 		struct unwind_table *table;
- 
--		spin_lock_irqsave(&unwind_lock, flags);
-+		raw_spin_lock_irqsave(&unwind_lock, flags);
- 		list_for_each_entry(table, &unwind_tables, list) {
- 			if (addr >= table->begin_addr &&
- 			    addr < table->end_addr) {
-@@ -213,7 +213,7 @@
- 				break;
- 			}
- 		}
--		spin_unlock_irqrestore(&unwind_lock, flags);
-+		raw_spin_unlock_irqrestore(&unwind_lock, flags);
- 	}
- 
- 	pr_debug("%s: idx = %p\n", __func__, idx);
-@@ -529,9 +529,9 @@
- 	tab->begin_addr = text_addr;
- 	tab->end_addr = text_addr + text_size;
- 
--	spin_lock_irqsave(&unwind_lock, flags);
-+	raw_spin_lock_irqsave(&unwind_lock, flags);
- 	list_add_tail(&tab->list, &unwind_tables);
--	spin_unlock_irqrestore(&unwind_lock, flags);
-+	raw_spin_unlock_irqrestore(&unwind_lock, flags);
- 
- 	return tab;
- }
-@@ -543,9 +543,9 @@
- 	if (!tab)
- 		return;
- 
--	spin_lock_irqsave(&unwind_lock, flags);
-+	raw_spin_lock_irqsave(&unwind_lock, flags);
- 	list_del(&tab->list);
--	spin_unlock_irqrestore(&unwind_lock, flags);
-+	raw_spin_unlock_irqrestore(&unwind_lock, flags);
- 
- 	kfree(tab);
- }
-diff -Nur linux-4.6.6.orig/arch/arm/kvm/arm.c linux-4.6.6/arch/arm/kvm/arm.c
---- linux-4.6.6.orig/arch/arm/kvm/arm.c	2016-08-10 12:54:57.000000000 +0200
-+++ linux-4.6.6/arch/arm/kvm/arm.c	2016-08-22 21:27:46.321823084 +0200
-@@ -582,7 +582,7 @@
- 		 * involves poking the GIC, which must be done in a
- 		 * non-preemptible context.
- 		 */
--		preempt_disable();
-+		migrate_disable();
- 		kvm_pmu_flush_hwstate(vcpu);
- 		kvm_timer_flush_hwstate(vcpu);
- 		kvm_vgic_flush_hwstate(vcpu);
-@@ -603,7 +603,7 @@
- 			kvm_pmu_sync_hwstate(vcpu);
- 			kvm_timer_sync_hwstate(vcpu);
- 			kvm_vgic_sync_hwstate(vcpu);
--			preempt_enable();
-+			migrate_enable();
- 			continue;
- 		}
- 
-@@ -659,7 +659,7 @@
- 
- 		kvm_vgic_sync_hwstate(vcpu);
- 
--		preempt_enable();
-+		migrate_enable();
- 
- 		ret = handle_exit(vcpu, run, ret);
- 	}
-diff -Nur linux-4.6.6.orig/arch/arm/mach-exynos/platsmp.c linux-4.6.6/arch/arm/mach-exynos/platsmp.c
---- linux-4.6.6.orig/arch/arm/mach-exynos/platsmp.c	2016-08-10 12:54:57.000000000 +0200
-+++ linux-4.6.6/arch/arm/mach-exynos/platsmp.c	2016-08-22 21:27:46.329823597 +0200
-@@ -229,7 +229,7 @@
- 	return (void __iomem *)(S5P_VA_SCU);
- }
- 
--static DEFINE_SPINLOCK(boot_lock);
-+static DEFINE_RAW_SPINLOCK(boot_lock);
- 
- static void exynos_secondary_init(unsigned int cpu)
- {
-@@ -242,8 +242,8 @@
- 	/*
- 	 * Synchronise with the boot thread.
- 	 */
--	spin_lock(&boot_lock);
--	spin_unlock(&boot_lock);
-+	raw_spin_lock(&boot_lock);
-+	raw_spin_unlock(&boot_lock);
- }
- 
- int exynos_set_boot_addr(u32 core_id, unsigned long boot_addr)
-@@ -307,7 +307,7 @@
- 	 * Set synchronisation state between this boot processor
- 	 * and the secondary one
- 	 */
--	spin_lock(&boot_lock);
-+	raw_spin_lock(&boot_lock);
- 
- 	/*
- 	 * The secondary processor is waiting to be released from
-@@ -334,7 +334,7 @@
- 
- 		if (timeout == 0) {
- 			printk(KERN_ERR "cpu1 power enable failed");
--			spin_unlock(&boot_lock);
-+			raw_spin_unlock(&boot_lock);
- 			return -ETIMEDOUT;
- 		}
- 	}
-@@ -380,7 +380,7 @@
- 	 * calibrations, then wait for it to finish
- 	 */
- fail:
--	spin_unlock(&boot_lock);
-+	raw_spin_unlock(&boot_lock);
- 
- 	return pen_release != -1 ? ret : 0;
- }
-diff -Nur linux-4.6.6.orig/arch/arm/mach-hisi/platmcpm.c linux-4.6.6/arch/arm/mach-hisi/platmcpm.c
---- linux-4.6.6.orig/arch/arm/mach-hisi/platmcpm.c	2016-08-10 12:54:57.000000000 +0200
-+++ linux-4.6.6/arch/arm/mach-hisi/platmcpm.c	2016-08-22 21:27:46.337824110 +0200
-@@ -61,7 +61,7 @@
- 
- static void __iomem *sysctrl, *fabric;
- static int hip04_cpu_table[HIP04_MAX_CLUSTERS][HIP04_MAX_CPUS_PER_CLUSTER];
--static DEFINE_SPINLOCK(boot_lock);
-+static DEFINE_RAW_SPINLOCK(boot_lock);
- static u32 fabric_phys_addr;
- /*
-  * [0]: bootwrapper physical address
-@@ -113,7 +113,7 @@
- 	if (cluster >= HIP04_MAX_CLUSTERS || cpu >= HIP04_MAX_CPUS_PER_CLUSTER)
- 		return -EINVAL;
- 
--	spin_lock_irq(&boot_lock);
-+	raw_spin_lock_irq(&boot_lock);
- 
- 	if (hip04_cpu_table[cluster][cpu])
- 		goto out;
-@@ -147,7 +147,7 @@
- 
- out:
- 	hip04_cpu_table[cluster][cpu]++;
--	spin_unlock_irq(&boot_lock);
-+	raw_spin_unlock_irq(&boot_lock);
- 
- 	return 0;
- }
-@@ -162,11 +162,11 @@
- 	cpu = MPIDR_AFFINITY_LEVEL(mpidr, 0);
- 	cluster = MPIDR_AFFINITY_LEVEL(mpidr, 1);
- 
--	spin_lock(&boot_lock);
-+	raw_spin_lock(&boot_lock);
- 	hip04_cpu_table[cluster][cpu]--;
- 	if (hip04_cpu_table[cluster][cpu] == 1) {
- 		/* A power_up request went ahead of us. */
--		spin_unlock(&boot_lock);
-+		raw_spin_unlock(&boot_lock);
- 		return;
- 	} else if (hip04_cpu_table[cluster][cpu] > 1) {
- 		pr_err("Cluster %d CPU%d boots multiple times\n", cluster, cpu);
-@@ -174,7 +174,7 @@
- 	}
- 
- 	last_man = hip04_cluster_is_down(cluster);
--	spin_unlock(&boot_lock);
-+	raw_spin_unlock(&boot_lock);
- 	if (last_man) {
- 		/* Since it's Cortex A15, disable L2 prefetching. */
- 		asm volatile(
-@@ -203,7 +203,7 @@
- 	       cpu >= HIP04_MAX_CPUS_PER_CLUSTER);
- 
- 	count = TIMEOUT_MSEC / POLL_MSEC;
--	spin_lock_irq(&boot_lock);
-+	raw_spin_lock_irq(&boot_lock);
- 	for (tries = 0; tries < count; tries++) {
- 		if (hip04_cpu_table[cluster][cpu])
- 			goto err;
-@@ -211,10 +211,10 @@
- 		data = readl_relaxed(sysctrl + SC_CPU_RESET_STATUS(cluster));
- 		if (data & CORE_WFI_STATUS(cpu))
- 			break;
--		spin_unlock_irq(&boot_lock);
-+		raw_spin_unlock_irq(&boot_lock);
- 		/* Wait for clean L2 when the whole cluster is down. */
- 		msleep(POLL_MSEC);
--		spin_lock_irq(&boot_lock);
-+		raw_spin_lock_irq(&boot_lock);
- 	}
- 	if (tries >= count)
- 		goto err;
-@@ -231,10 +231,10 @@
- 		goto err;
- 	if (hip04_cluster_is_down(cluster))
- 		hip04_set_snoop_filter(cluster, 0);
--	spin_unlock_irq(&boot_lock);
-+	raw_spin_unlock_irq(&boot_lock);
- 	return 1;
- err:
--	spin_unlock_irq(&boot_lock);
-+	raw_spin_unlock_irq(&boot_lock);
- 	return 0;
- }
- #endif
-diff -Nur linux-4.6.6.orig/arch/arm/mach-imx/Kconfig linux-4.6.6/arch/arm/mach-imx/Kconfig
---- linux-4.6.6.orig/arch/arm/mach-imx/Kconfig	2016-08-10 12:54:57.000000000 +0200
-+++ linux-4.6.6/arch/arm/mach-imx/Kconfig	2016-08-22 21:27:46.337824110 +0200
-@@ -526,7 +526,7 @@
- 	bool "i.MX6 Quad/DualLite support"
- 	select ARM_ERRATA_764369 if SMP
- 	select HAVE_ARM_SCU if SMP
--	select HAVE_ARM_TWD if SMP
-+	select HAVE_ARM_TWD
- 	select PCI_DOMAINS if PCI
- 	select PINCTRL_IMX6Q
- 	select SOC_IMX6
-diff -Nur linux-4.6.6.orig/arch/arm/mach-omap2/omap-smp.c linux-4.6.6/arch/arm/mach-omap2/omap-smp.c
---- linux-4.6.6.orig/arch/arm/mach-omap2/omap-smp.c	2016-08-10 12:54:57.000000000 +0200
-+++ linux-4.6.6/arch/arm/mach-omap2/omap-smp.c	2016-08-22 21:27:46.345824623 +0200
-@@ -43,7 +43,7 @@
- /* SCU base address */
- static void __iomem *scu_base;
- 
--static DEFINE_SPINLOCK(boot_lock);
-+static DEFINE_RAW_SPINLOCK(boot_lock);
- 
- void __iomem *omap4_get_scu_base(void)
- {
-@@ -74,8 +74,8 @@
- 	/*
- 	 * Synchronise with the boot thread.
- 	 */
--	spin_lock(&boot_lock);
--	spin_unlock(&boot_lock);
-+	raw_spin_lock(&boot_lock);
-+	raw_spin_unlock(&boot_lock);
- }
- 
- static int omap4_boot_secondary(unsigned int cpu, struct task_struct *idle)
-@@ -89,7 +89,7 @@
- 	 * Set synchronisation state between this boot processor
- 	 * and the secondary one
- 	 */
--	spin_lock(&boot_lock);
-+	raw_spin_lock(&boot_lock);
- 
- 	/*
- 	 * Update the AuxCoreBoot0 with boot state for secondary core.
-@@ -166,7 +166,7 @@
- 	 * Now the secondary core is starting up let it run its
- 	 * calibrations, then wait for it to finish
- 	 */
--	spin_unlock(&boot_lock);
-+	raw_spin_unlock(&boot_lock);
- 
- 	return 0;
- }
-diff -Nur linux-4.6.6.orig/arch/arm/mach-prima2/platsmp.c linux-4.6.6/arch/arm/mach-prima2/platsmp.c
---- linux-4.6.6.orig/arch/arm/mach-prima2/platsmp.c	2016-08-10 12:54:57.000000000 +0200
-+++ linux-4.6.6/arch/arm/mach-prima2/platsmp.c	2016-08-22 21:27:46.353825136 +0200
-@@ -22,7 +22,7 @@
- 
- static void __iomem *clk_base;
- 
--static DEFINE_SPINLOCK(boot_lock);
-+static DEFINE_RAW_SPINLOCK(boot_lock);
- 
- static void sirfsoc_secondary_init(unsigned int cpu)
- {
-@@ -36,8 +36,8 @@
- 	/*
- 	 * Synchronise with the boot thread.
- 	 */
--	spin_lock(&boot_lock);
--	spin_unlock(&boot_lock);
-+	raw_spin_lock(&boot_lock);
-+	raw_spin_unlock(&boot_lock);
- }
- 
- static const struct of_device_id clk_ids[]  = {
-@@ -75,7 +75,7 @@
- 	/* make sure write buffer is drained */
- 	mb();
- 
--	spin_lock(&boot_lock);
-+	raw_spin_lock(&boot_lock);
- 
- 	/*
- 	 * The secondary processor is waiting to be released from
-@@ -107,7 +107,7 @@
- 	 * now the secondary core is starting up let it run its
- 	 * calibrations, then wait for it to finish
- 	 */
--	spin_unlock(&boot_lock);
-+	raw_spin_unlock(&boot_lock);
- 
- 	return pen_release != -1 ? -ENOSYS : 0;
- }
-diff -Nur linux-4.6.6.orig/arch/arm/mach-qcom/platsmp.c linux-4.6.6/arch/arm/mach-qcom/platsmp.c
---- linux-4.6.6.orig/arch/arm/mach-qcom/platsmp.c	2016-08-10 12:54:57.000000000 +0200
-+++ linux-4.6.6/arch/arm/mach-qcom/platsmp.c	2016-08-22 21:27:46.361825650 +0200
-@@ -46,7 +46,7 @@
- 
- extern void secondary_startup_arm(void);
- 
--static DEFINE_SPINLOCK(boot_lock);
-+static DEFINE_RAW_SPINLOCK(boot_lock);
- 
- #ifdef CONFIG_HOTPLUG_CPU
- static void qcom_cpu_die(unsigned int cpu)
-@@ -60,8 +60,8 @@
- 	/*
- 	 * Synchronise with the boot thread.
- 	 */
--	spin_lock(&boot_lock);
--	spin_unlock(&boot_lock);
-+	raw_spin_lock(&boot_lock);
-+	raw_spin_unlock(&boot_lock);
- }
- 
- static int scss_release_secondary(unsigned int cpu)
-@@ -284,7 +284,7 @@
- 	 * set synchronisation state between this boot processor
- 	 * and the secondary one
- 	 */
--	spin_lock(&boot_lock);
-+	raw_spin_lock(&boot_lock);
- 
- 	/*
- 	 * Send the secondary CPU a soft interrupt, thereby causing
-@@ -297,7 +297,7 @@
- 	 * now the secondary core is starting up let it run its
- 	 * calibrations, then wait for it to finish
- 	 */
--	spin_unlock(&boot_lock);
-+	raw_spin_unlock(&boot_lock);
- 
- 	return ret;
- }
-diff -Nur linux-4.6.6.orig/arch/arm/mach-spear/platsmp.c linux-4.6.6/arch/arm/mach-spear/platsmp.c
---- linux-4.6.6.orig/arch/arm/mach-spear/platsmp.c	2016-08-10 12:54:57.000000000 +0200
-+++ linux-4.6.6/arch/arm/mach-spear/platsmp.c	2016-08-22 21:27:46.365825902 +0200
-@@ -32,7 +32,7 @@
- 	sync_cache_w(&pen_release);
- }
- 
--static DEFINE_SPINLOCK(boot_lock);
-+static DEFINE_RAW_SPINLOCK(boot_lock);
- 
- static void __iomem *scu_base = IOMEM(VA_SCU_BASE);
- 
-@@ -47,8 +47,8 @@
- 	/*
- 	 * Synchronise with the boot thread.
- 	 */
--	spin_lock(&boot_lock);
--	spin_unlock(&boot_lock);
-+	raw_spin_lock(&boot_lock);
-+	raw_spin_unlock(&boot_lock);
- }
- 
- static int spear13xx_boot_secondary(unsigned int cpu, struct task_struct *idle)
-@@ -59,7 +59,7 @@
- 	 * set synchronisation state between this boot processor
- 	 * and the secondary one
- 	 */
--	spin_lock(&boot_lock);
-+	raw_spin_lock(&boot_lock);
- 
- 	/*
- 	 * The secondary processor is waiting to be released from
-@@ -84,7 +84,7 @@
- 	 * now the secondary core is starting up let it run its
- 	 * calibrations, then wait for it to finish
- 	 */
--	spin_unlock(&boot_lock);
-+	raw_spin_unlock(&boot_lock);
- 
- 	return pen_release != -1 ? -ENOSYS : 0;
- }
-diff -Nur linux-4.6.6.orig/arch/arm/mach-sti/platsmp.c linux-4.6.6/arch/arm/mach-sti/platsmp.c
---- linux-4.6.6.orig/arch/arm/mach-sti/platsmp.c	2016-08-10 12:54:57.000000000 +0200
-+++ linux-4.6.6/arch/arm/mach-sti/platsmp.c	2016-08-22 21:27:46.369826163 +0200
-@@ -35,7 +35,7 @@
- 	sync_cache_w(&pen_release);
- }
- 
--static DEFINE_SPINLOCK(boot_lock);
-+static DEFINE_RAW_SPINLOCK(boot_lock);
- 
- static void sti_secondary_init(unsigned int cpu)
- {
-@@ -48,8 +48,8 @@
- 	/*
- 	 * Synchronise with the boot thread.
- 	 */
--	spin_lock(&boot_lock);
--	spin_unlock(&boot_lock);
-+	raw_spin_lock(&boot_lock);
-+	raw_spin_unlock(&boot_lock);
- }
- 
- static int sti_boot_secondary(unsigned int cpu, struct task_struct *idle)
-@@ -60,7 +60,7 @@
- 	 * set synchronisation state between this boot processor
- 	 * and the secondary one
- 	 */
--	spin_lock(&boot_lock);
-+	raw_spin_lock(&boot_lock);
- 
- 	/*
- 	 * The secondary processor is waiting to be released from
-@@ -91,7 +91,7 @@
- 	 * now the secondary core is starting up let it run its
- 	 * calibrations, then wait for it to finish
- 	 */
--	spin_unlock(&boot_lock);
-+	raw_spin_unlock(&boot_lock);
- 
- 	return pen_release != -1 ? -ENOSYS : 0;
- }
-diff -Nur linux-4.6.6.orig/arch/arm/mm/fault.c linux-4.6.6/arch/arm/mm/fault.c
---- linux-4.6.6.orig/arch/arm/mm/fault.c	2016-08-10 12:54:57.000000000 +0200
-+++ linux-4.6.6/arch/arm/mm/fault.c	2016-08-22 21:27:46.369826163 +0200
-@@ -430,6 +430,9 @@
- 	if (addr < TASK_SIZE)
- 		return do_page_fault(addr, fsr, regs);
- 
-+	if (interrupts_enabled(regs))
-+		local_irq_enable();
-+
- 	if (user_mode(regs))
- 		goto bad_area;
- 
-@@ -497,6 +500,9 @@
- static int
- do_sect_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
- {
-+	if (interrupts_enabled(regs))
-+		local_irq_enable();
-+
- 	do_bad_area(addr, fsr, regs);
- 	return 0;
- }
-diff -Nur linux-4.6.6.orig/arch/arm/mm/highmem.c linux-4.6.6/arch/arm/mm/highmem.c
---- linux-4.6.6.orig/arch/arm/mm/highmem.c	2016-08-10 12:54:57.000000000 +0200
-+++ linux-4.6.6/arch/arm/mm/highmem.c	2016-08-22 21:27:46.369826163 +0200
-@@ -34,6 +34,11 @@
- 	return *ptep;
- }
- 
-+static unsigned int fixmap_idx(int type)
-+{
-+	return FIX_KMAP_BEGIN + type + KM_TYPE_NR * smp_processor_id();
-+}
-+
- void *kmap(struct page *page)
- {
- 	might_sleep();
-@@ -54,12 +59,13 @@
- 
- void *kmap_atomic(struct page *page)
- {
-+	pte_t pte = mk_pte(page, kmap_prot);
- 	unsigned int idx;
- 	unsigned long vaddr;
- 	void *kmap;
- 	int type;
- 
--	preempt_disable();
-+	preempt_disable_nort();
- 	pagefault_disable();
- 	if (!PageHighMem(page))
- 		return page_address(page);
-@@ -79,7 +85,7 @@
- 
- 	type = kmap_atomic_idx_push();
- 
--	idx = FIX_KMAP_BEGIN + type + KM_TYPE_NR * smp_processor_id();
-+	idx = fixmap_idx(type);
- 	vaddr = __fix_to_virt(idx);
- #ifdef CONFIG_DEBUG_HIGHMEM
- 	/*
-@@ -93,7 +99,10 @@
- 	 * in place, so the contained TLB flush ensures the TLB is updated
- 	 * with the new mapping.
- 	 */
--	set_fixmap_pte(idx, mk_pte(page, kmap_prot));
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+	current->kmap_pte[type] = pte;
-+#endif
-+	set_fixmap_pte(idx, pte);
- 
- 	return (void *)vaddr;
- }
-@@ -106,44 +115,75 @@
- 
- 	if (kvaddr >= (void *)FIXADDR_START) {
- 		type = kmap_atomic_idx();
--		idx = FIX_KMAP_BEGIN + type + KM_TYPE_NR * smp_processor_id();
-+		idx = fixmap_idx(type);
- 
- 		if (cache_is_vivt())
- 			__cpuc_flush_dcache_area((void *)vaddr, PAGE_SIZE);
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+		current->kmap_pte[type] = __pte(0);
-+#endif
- #ifdef CONFIG_DEBUG_HIGHMEM
- 		BUG_ON(vaddr != __fix_to_virt(idx));
--		set_fixmap_pte(idx, __pte(0));
- #else
- 		(void) idx;  /* to kill a warning */
- #endif
-+		set_fixmap_pte(idx, __pte(0));
- 		kmap_atomic_idx_pop();
- 	} else if (vaddr >= PKMAP_ADDR(0) && vaddr < PKMAP_ADDR(LAST_PKMAP)) {
- 		/* this address was obtained through kmap_high_get() */
- 		kunmap_high(pte_page(pkmap_page_table[PKMAP_NR(vaddr)]));
- 	}
- 	pagefault_enable();
--	preempt_enable();
-+	preempt_enable_nort();
- }
- EXPORT_SYMBOL(__kunmap_atomic);
- 
- void *kmap_atomic_pfn(unsigned long pfn)
- {
-+	pte_t pte = pfn_pte(pfn, kmap_prot);
- 	unsigned long vaddr;
- 	int idx, type;
- 	struct page *page = pfn_to_page(pfn);
- 
--	preempt_disable();
-+	preempt_disable_nort();
- 	pagefault_disable();
- 	if (!PageHighMem(page))
- 		return page_address(page);
- 
- 	type = kmap_atomic_idx_push();
--	idx = FIX_KMAP_BEGIN + type + KM_TYPE_NR * smp_processor_id();
-+	idx = fixmap_idx(type);
- 	vaddr = __fix_to_virt(idx);
- #ifdef CONFIG_DEBUG_HIGHMEM
- 	BUG_ON(!pte_none(get_fixmap_pte(vaddr)));
- #endif
--	set_fixmap_pte(idx, pfn_pte(pfn, kmap_prot));
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+	current->kmap_pte[type] = pte;
-+#endif
-+	set_fixmap_pte(idx, pte);
- 
- 	return (void *)vaddr;
- }
-+#if defined CONFIG_PREEMPT_RT_FULL
-+void switch_kmaps(struct task_struct *prev_p, struct task_struct *next_p)
-+{
-+	int i;
-+
-+	/*
-+	 * Clear @prev's kmap_atomic mappings
-+	 */
-+	for (i = 0; i < prev_p->kmap_idx; i++) {
-+		int idx = fixmap_idx(i);
-+
-+		set_fixmap_pte(idx, __pte(0));
-+	}
-+	/*
-+	 * Restore @next_p's kmap_atomic mappings
-+	 */
-+	for (i = 0; i < next_p->kmap_idx; i++) {
-+		int idx = fixmap_idx(i);
-+
-+		if (!pte_none(next_p->kmap_pte[i]))
-+			set_fixmap_pte(idx, next_p->kmap_pte[i]);
-+	}
-+}
-+#endif
-diff -Nur linux-4.6.6.orig/arch/arm/plat-versatile/platsmp.c linux-4.6.6/arch/arm/plat-versatile/platsmp.c
---- linux-4.6.6.orig/arch/arm/plat-versatile/platsmp.c	2016-08-10 12:54:57.000000000 +0200
-+++ linux-