linux: update realtime patch, reported by Oliver

1 files changed, 3737 insertions, 3906 deletions

diff --git a/target/linux/patches/4.4.28/patch-realtime b/target/linux/patches/4.4.28/patch-realtime
index f4cb92ae5..9dd3be37b 100644
--- a/target/linux/patches/4.4.28/patch-realtime
+++ b/target/linux/patches/4.4.28/patch-realtime
@@ -1,371 +1,6 @@
- From:
- https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/
-
-diff --git a/Documentation/hwlat_detector.txt b/Documentation/hwlat_detector.txt
-new file mode 100644
-index 000000000000..cb61516483d3
---- /dev/null
-+++ b/Documentation/hwlat_detector.txt
-@@ -0,0 +1,64 @@
-+Introduction:
-+-------------
-+
-+The module hwlat_detector is a special purpose kernel module that is used to
-+detect large system latencies induced by the behavior of certain underlying
-+hardware or firmware, independent of Linux itself. The code was developed
-+originally to detect SMIs (System Management Interrupts) on x86 systems,
-+however there is nothing x86 specific about this patchset. It was
-+originally written for use by the "RT" patch since the Real Time
-+kernel is highly latency sensitive.
-+
-+SMIs are usually not serviced by the Linux kernel, which typically does not
-+even know that they are occuring. SMIs are instead are set up by BIOS code
-+and are serviced by BIOS code, usually for "critical" events such as
-+management of thermal sensors and fans. Sometimes though, SMIs are used for
-+other tasks and those tasks can spend an inordinate amount of time in the
-+handler (sometimes measured in milliseconds). Obviously this is a problem if
-+you are trying to keep event service latencies down in the microsecond range.
-+
-+The hardware latency detector works by hogging all of the cpus for configurable
-+amounts of time (by calling stop_machine()), polling the CPU Time Stamp Counter
-+for some period, then looking for gaps in the TSC data. Any gap indicates a
-+time when the polling was interrupted and since the machine is stopped and
-+interrupts turned off the only thing that could do that would be an SMI.
-+
-+Note that the SMI detector should *NEVER* be used in a production environment.
-+It is intended to be run manually to determine if the hardware platform has a
-+problem with long system firmware service routines.
-+
-+Usage:
-+------
-+
-+Loading the module hwlat_detector passing the parameter "enabled=1" (or by
-+setting the "enable" entry in "hwlat_detector" debugfs toggled on) is the only
-+step required to start the hwlat_detector. It is possible to redefine the
-+threshold in microseconds (us) above which latency spikes will be taken
-+into account (parameter "threshold=").
-+
-+Example:
-+
-+	# modprobe hwlat_detector enabled=1 threshold=100
-+
-+After the module is loaded, it creates a directory named "hwlat_detector" under
-+the debugfs mountpoint, "/debug/hwlat_detector" for this text. It is necessary
-+to have debugfs mounted, which might be on /sys/debug on your system.
-+
-+The /debug/hwlat_detector interface contains the following files:
-+
-+count			- number of latency spikes observed since last reset
-+enable			- a global enable/disable toggle (0/1), resets count
-+max			- maximum hardware latency actually observed (usecs)
-+sample			- a pipe from which to read current raw sample data
-+			  in the format <timestamp> <latency observed usecs>
-+			  (can be opened O_NONBLOCK for a single sample)
-+threshold		- minimum latency value to be considered (usecs)
-+width			- time period to sample with CPUs held (usecs)
-+			  must be less than the total window size (enforced)
-+window			- total period of sampling, width being inside (usecs)
-+
-+By default we will set width to 500,000 and window to 1,000,000, meaning that
-+we will sample every 1,000,000 usecs (1s) for 500,000 usecs (0.5s). If we
-+observe any latencies that exceed the threshold (initially 100 usecs),
-+then we write to a global sample ring buffer of 8K samples, which is
-+consumed by reading from the "sample" (pipe) debugfs file interface.
-diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
-index 0e4102ae1a61..26b5f39d57a8 100644
---- a/Documentation/kernel-parameters.txt
-+++ b/Documentation/kernel-parameters.txt
-@@ -1629,6 +1629,15 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
- 	ip=		[IP_PNP]
- 			See Documentation/filesystems/nfs/nfsroot.txt.
- 
-+	irqaffinity=	[SMP] Set the default irq affinity mask
-+			Format:
-+			<cpu number>,...,<cpu number>
-+			or
-+			<cpu number>-<cpu number>
-+			(must be a positive range in ascending order)
-+			or a mixture
-+			<cpu number>,...,<cpu number>-<cpu number>
-+
- 	irqfixup	[HW]
- 			When an interrupt is not handled search all handlers
- 			for it. Intended to get systems with badly broken
-diff --git a/Documentation/sysrq.txt b/Documentation/sysrq.txt
-index 13f5619b2203..f64d075ba647 100644
---- a/Documentation/sysrq.txt
-+++ b/Documentation/sysrq.txt
-@@ -59,10 +59,17 @@ On PowerPC - Press 'ALT - Print Screen (or F13) - <command key>,
- On other - If you know of the key combos for other architectures, please
-            let me know so I can add them to this section.
- 
--On all -  write a character to /proc/sysrq-trigger.  e.g.:
--
-+On all -  write a character to /proc/sysrq-trigger, e.g.:
- 		echo t > /proc/sysrq-trigger
- 
-+On all - Enable network SysRq by writing a cookie to icmp_echo_sysrq, e.g.
-+		echo 0x01020304 >/proc/sys/net/ipv4/icmp_echo_sysrq
-+	 Send an ICMP echo request with this pattern plus the particular
-+	 SysRq command key. Example:
-+		# ping -c1 -s57 -p0102030468
-+	 will trigger the SysRq-H (help) command.
-+
-+
- *  What are the 'command' keys?
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- 'b'     - Will immediately reboot the system without syncing or unmounting
-diff --git a/Documentation/trace/histograms.txt b/Documentation/trace/histograms.txt
-new file mode 100644
-index 000000000000..6f2aeabf7faa
---- /dev/null
-+++ b/Documentation/trace/histograms.txt
-@@ -0,0 +1,186 @@
-+		Using the Linux Kernel Latency Histograms
-+
-+
-+This document gives a short explanation how to enable, configure and use
-+latency histograms. Latency histograms are primarily relevant in the
-+context of real-time enabled kernels (CONFIG_PREEMPT/CONFIG_PREEMPT_RT)
-+and are used in the quality management of the Linux real-time
-+capabilities.
-+
-+
-+* Purpose of latency histograms
-+
-+A latency histogram continuously accumulates the frequencies of latency
-+data. There are two types of histograms
-+- potential sources of latencies
-+- effective latencies
-+
-+
-+* Potential sources of latencies
-+
-+Potential sources of latencies are code segments where interrupts,
-+preemption or both are disabled (aka critical sections). To create
-+histograms of potential sources of latency, the kernel stores the time
-+stamp at the start of a critical section, determines the time elapsed
-+when the end of the section is reached, and increments the frequency
-+counter of that latency value - irrespective of whether any concurrently
-+running process is affected by latency or not.
-+- Configuration items (in the Kernel hacking/Tracers submenu)
-+  CONFIG_INTERRUPT_OFF_LATENCY
-+  CONFIG_PREEMPT_OFF_LATENCY
-+
-+
-+* Effective latencies
-+
-+Effective latencies are actually occuring during wakeup of a process. To
-+determine effective latencies, the kernel stores the time stamp when a
-+process is scheduled to be woken up, and determines the duration of the
-+wakeup time shortly before control is passed over to this process. Note
-+that the apparent latency in user space may be somewhat longer, since the
-+process may be interrupted after control is passed over to it but before
-+the execution in user space takes place. Simply measuring the interval
-+between enqueuing and wakeup may also not appropriate in cases when a
-+process is scheduled as a result of a timer expiration. The timer may have
-+missed its deadline, e.g. due to disabled interrupts, but this latency
-+would not be registered. Therefore, the offsets of missed timers are
-+recorded in a separate histogram. If both wakeup latency and missed timer
-+offsets are configured and enabled, a third histogram may be enabled that
-+records the overall latency as a sum of the timer latency, if any, and the
-+wakeup latency. This histogram is called "timerandwakeup".
-+- Configuration items (in the Kernel hacking/Tracers submenu)
-+  CONFIG_WAKEUP_LATENCY
-+  CONFIG_MISSED_TIMER_OFSETS
-+
-+
-+* Usage
-+
-+The interface to the administration of the latency histograms is located
-+in the debugfs file system. To mount it, either enter
-+
-+mount -t sysfs nodev /sys
-+mount -t debugfs nodev /sys/kernel/debug
-+
-+from shell command line level, or add
-+
-+nodev	/sys			sysfs	defaults	0 0
-+nodev	/sys/kernel/debug	debugfs	defaults	0 0
-+
-+to the file /etc/fstab. All latency histogram related files are then
-+available in the directory /sys/kernel/debug/tracing/latency_hist. A
-+particular histogram type is enabled by writing non-zero to the related
-+variable in the /sys/kernel/debug/tracing/latency_hist/enable directory.
-+Select "preemptirqsoff" for the histograms of potential sources of
-+latencies and "wakeup" for histograms of effective latencies etc. The
-+histogram data - one per CPU - are available in the files
-+
-+/sys/kernel/debug/tracing/latency_hist/preemptoff/CPUx
-+/sys/kernel/debug/tracing/latency_hist/irqsoff/CPUx
-+/sys/kernel/debug/tracing/latency_hist/preemptirqsoff/CPUx
-+/sys/kernel/debug/tracing/latency_hist/wakeup/CPUx
-+/sys/kernel/debug/tracing/latency_hist/wakeup/sharedprio/CPUx
-+/sys/kernel/debug/tracing/latency_hist/missed_timer_offsets/CPUx
-+/sys/kernel/debug/tracing/latency_hist/timerandwakeup/CPUx
-+
-+The histograms are reset by writing non-zero to the file "reset" in a
-+particular latency directory. To reset all latency data, use
-+
-+#!/bin/sh
-+
-+TRACINGDIR=/sys/kernel/debug/tracing
-+HISTDIR=$TRACINGDIR/latency_hist
-+
-+if test -d $HISTDIR
-+then
-+  cd $HISTDIR
-+  for i in `find . | grep /reset$`
-+  do
-+    echo 1 >$i
-+  done
-+fi
-+
-+
-+* Data format
-+
-+Latency data are stored with a resolution of one microsecond. The
-+maximum latency is 10,240 microseconds. The data are only valid, if the
-+overflow register is empty. Every output line contains the latency in
-+microseconds in the first row and the number of samples in the second
-+row. To display only lines with a positive latency count, use, for
-+example,
-+
-+grep -v " 0$" /sys/kernel/debug/tracing/latency_hist/preemptoff/CPU0
-+
-+#Minimum latency: 0 microseconds.
-+#Average latency: 0 microseconds.
-+#Maximum latency: 25 microseconds.
-+#Total samples: 3104770694
-+#There are 0 samples greater or equal than 10240 microseconds
-+#usecs	         samples
-+    0	      2984486876
-+    1	        49843506
-+    2	        58219047
-+    3	         5348126
-+    4	         2187960
-+    5	         3388262
-+    6	          959289
-+    7	          208294
-+    8	           40420
-+    9	            4485
-+   10	           14918
-+   11	           18340
-+   12	           25052
-+   13	           19455
-+   14	            5602
-+   15	             969
-+   16	              47
-+   17	              18
-+   18	              14
-+   19	               1
-+   20	               3
-+   21	               2
-+   22	               5
-+   23	               2
-+   25	               1
-+
-+
-+* Wakeup latency of a selected process
-+
-+To only collect wakeup latency data of a particular process, write the
-+PID of the requested process to
-+
-+/sys/kernel/debug/tracing/latency_hist/wakeup/pid
-+
-+PIDs are not considered, if this variable is set to 0.
-+
-+
-+* Details of the process with the highest wakeup latency so far
-+
-+Selected data of the process that suffered from the highest wakeup
-+latency that occurred in a particular CPU are available in the file
-+
-+/sys/kernel/debug/tracing/latency_hist/wakeup/max_latency-CPUx.
-+
-+In addition, other relevant system data at the time when the
-+latency occurred are given.
-+
-+The format of the data is (all in one line):
-+<PID> <Priority> <Latency> (<Timeroffset>) <Command> \
-+<- <PID> <Priority> <Command> <Timestamp>
-+
-+The value of <Timeroffset> is only relevant in the combined timer
-+and wakeup latency recording. In the wakeup recording, it is
-+always 0, in the missed_timer_offsets recording, it is the same
-+as <Latency>.
-+
-+When retrospectively searching for the origin of a latency and
-+tracing was not enabled, it may be helpful to know the name and
-+some basic data of the task that (finally) was switching to the
-+late real-tlme task. In addition to the victim's data, also the
-+data of the possible culprit are therefore displayed after the
-+"<-" symbol.
-+
-+Finally, the timestamp of the time when the latency occurred
-+in <seconds>.<microseconds> after the most recent system boot
-+is provided.
-+
-+These data are also reset when the wakeup histogram is reset.
-diff --git a/Makefile b/Makefile
-index 695c64ec160c..45b60fceb84b 100644
---- a/Makefile
-+++ b/Makefile
-@@ -768,6 +768,9 @@ KBUILD_CFLAGS   += $(call cc-option,-Werror=strict-prototypes)
- # Prohibit date/time macros, which would make the build non-deterministic
- KBUILD_CFLAGS   += $(call cc-option,-Werror=date-time)
- 
-+# enforce correct pointer usage
-+KBUILD_CFLAGS   += $(call cc-option,-Werror=incompatible-pointer-types)
-+
- # use the deterministic mode of AR if available
- KBUILD_ARFLAGS := $(call ar-option,D)
- 
-diff --git a/arch/Kconfig b/arch/Kconfig
-index 4e949e58b192..3b26d76933fb 100644
---- a/arch/Kconfig
-+++ b/arch/Kconfig
-@@ -9,6 +9,7 @@ config OPROFILE
- 	tristate "OProfile system profiling"
- 	depends on PROFILING
- 	depends on HAVE_OPROFILE
-+	depends on !PREEMPT_RT_FULL
- 	select RING_BUFFER
- 	select RING_BUFFER_ALLOW_SWAP
- 	help
-@@ -52,6 +53,7 @@ config KPROBES
- config JUMP_LABEL
-        bool "Optimize very unlikely/likely branches"
-        depends on HAVE_ARCH_JUMP_LABEL
-+       depends on (!INTERRUPT_OFF_HIST && !PREEMPT_OFF_HIST && !WAKEUP_LATENCY_HIST && !MISSED_TIMER_OFFSETS_HIST)
-        help
-          This option enables a transparent branch optimization that
- 	 makes certain almost-always-true or almost-always-false branch
-diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index 34e1569a11ee..79c4603e9453 100644
---- a/arch/arm/Kconfig
-+++ b/arch/arm/Kconfig
-@@ -33,7 +33,7 @@ config ARM
- 	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
-+	select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL && !CPU_ENDIAN_BE32 && !PREEMPT_RT_BASE
- 	select HAVE_ARCH_KGDB if !CPU_ENDIAN_BE32
- 	select HAVE_ARCH_SECCOMP_FILTER if (AEABI && !OABI_COMPAT)
- 	select HAVE_ARCH_TRACEHOOK
-@@ -68,6 +68,7 @@ config ARM
- 	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 --git a/arch/arm/include/asm/switch_to.h b/arch/arm/include/asm/switch_to.h
-index 12ebfcc1d539..c962084605bc 100644
---- a/arch/arm/include/asm/switch_to.h
-+++ b/arch/arm/include/asm/switch_to.h
+diff -Nur linux-4.4.28.orig/arch/arm/include/asm/switch_to.h linux-4.4.28/arch/arm/include/asm/switch_to.h
+--- linux-4.4.28.orig/arch/arm/include/asm/switch_to.h	2016-10-28 09:53:25.000000000 +0200
++++ linux-4.4.28/arch/arm/include/asm/switch_to.h	2016-11-01 21:26:56.728210258 +0100
 @@ -3,6 +3,13 @@
  
  #include <linux/thread_info.h>
@@ -380,7 +15,7 @@ index 12ebfcc1d539..c962084605bc 100644
  /*
   * 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 @@ extern struct task_struct *__switch_to(struct task_struct *, struct thread_info
+@@ -25,6 +32,7 @@
  #define switch_to(prev,next,last)					\
  do {									\
  	__complete_pending_tlbi();					\
@@ -388,11 +23,10 @@ index 12ebfcc1d539..c962084605bc 100644
  	last = __switch_to(prev,task_thread_info(prev), task_thread_info(next));	\
  } while (0)
  
-diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h
-index 776757d1604a..1f36a4eccc72 100644
---- a/arch/arm/include/asm/thread_info.h
-+++ b/arch/arm/include/asm/thread_info.h
-@@ -49,6 +49,7 @@ struct cpu_context_save {
+diff -Nur linux-4.4.28.orig/arch/arm/include/asm/thread_info.h linux-4.4.28/arch/arm/include/asm/thread_info.h
+--- linux-4.4.28.orig/arch/arm/include/asm/thread_info.h	2016-10-28 09:53:25.000000000 +0200
++++ linux-4.4.28/arch/arm/include/asm/thread_info.h	2016-11-01 21:26:56.748211548 +0100
+@@ -49,6 +49,7 @@
  struct thread_info {
  	unsigned long		flags;		/* low level flags */
  	int			preempt_count;	/* 0 => preemptable, <0 => bug */
@@ -400,7 +34,7 @@ index 776757d1604a..1f36a4eccc72 100644
  	mm_segment_t		addr_limit;	/* address limit */
  	struct task_struct	*task;		/* main task structure */
  	__u32			cpu;		/* cpu */
-@@ -142,7 +143,8 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
+@@ -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 */
@@ -410,7 +44,7 @@ index 776757d1604a..1f36a4eccc72 100644
  
  #define TIF_NOHZ		12	/* in adaptive nohz mode */
  #define TIF_USING_IWMMXT	17
-@@ -152,6 +154,7 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
+@@ -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)
@@ -418,7 +52,7 @@ index 776757d1604a..1f36a4eccc72 100644
  #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 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
+@@ -167,7 +170,8 @@
   * Change these and you break ASM code in entry-common.S
   */
  #define _TIF_WORK_MASK		(_TIF_NEED_RESCHED | _TIF_SIGPENDING | \
@@ -428,11 +62,30 @@ index 776757d1604a..1f36a4eccc72 100644
  
  #endif /* __KERNEL__ */
  #endif /* __ASM_ARM_THREAD_INFO_H */
-diff --git a/arch/arm/kernel/asm-offsets.c b/arch/arm/kernel/asm-offsets.c
-index 871b8267d211..4dbe70de7318 100644
---- a/arch/arm/kernel/asm-offsets.c
-+++ b/arch/arm/kernel/asm-offsets.c
-@@ -65,6 +65,7 @@ int main(void)
+diff -Nur linux-4.4.28.orig/arch/arm/Kconfig linux-4.4.28/arch/arm/Kconfig
+--- linux-4.4.28.orig/arch/arm/Kconfig	2016-10-28 09:53:25.000000000 +0200
++++ linux-4.4.28/arch/arm/Kconfig	2016-11-01 21:26:56.696208202 +0100
+@@ -33,7 +33,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
++	select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL && !CPU_ENDIAN_BE32 && !PREEMPT_RT_BASE
+ 	select HAVE_ARCH_KGDB if !CPU_ENDIAN_BE32
+ 	select HAVE_ARCH_SECCOMP_FILTER if (AEABI && !OABI_COMPAT)
+ 	select HAVE_ARCH_TRACEHOOK
+@@ -68,6 +68,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.4.28.orig/arch/arm/kernel/asm-offsets.c linux-4.4.28/arch/arm/kernel/asm-offsets.c
+--- linux-4.4.28.orig/arch/arm/kernel/asm-offsets.c	2016-10-28 09:53:25.000000000 +0200
++++ linux-4.4.28/arch/arm/kernel/asm-offsets.c	2016-11-01 21:26:56.760212322 +0100
+@@ -65,6 +65,7 @@
    BLANK();
    DEFINE(TI_FLAGS,		offsetof(struct thread_info, flags));
    DEFINE(TI_PREEMPT,		offsetof(struct thread_info, preempt_count));
@@ -440,11 +93,10 @@ index 871b8267d211..4dbe70de7318 100644
    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 --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
-index 3ce377f7251f..d044cea59f54 100644
---- a/arch/arm/kernel/entry-armv.S
-+++ b/arch/arm/kernel/entry-armv.S
-@@ -215,11 +215,18 @@ __irq_svc:
+diff -Nur linux-4.4.28.orig/arch/arm/kernel/entry-armv.S linux-4.4.28/arch/arm/kernel/entry-armv.S
+--- linux-4.4.28.orig/arch/arm/kernel/entry-armv.S	2016-10-28 09:53:25.000000000 +0200
++++ linux-4.4.28/arch/arm/kernel/entry-armv.S	2016-11-01 21:26:56.764212578 +0100
+@@ -215,11 +215,18 @@
  #ifdef CONFIG_PREEMPT
  	get_thread_info tsk
  	ldr	r8, [tsk, #TI_PREEMPT]		@ get preempt count
@@ -465,7 +117,7 @@ index 3ce377f7251f..d044cea59f54 100644
  #endif
  
  	svc_exit r5, irq = 1			@ return from exception
-@@ -234,8 +241,14 @@ svc_preempt:
+@@ -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
@@ -481,11 +133,10 @@ index 3ce377f7251f..d044cea59f54 100644
  #endif
  
  __und_fault:
-diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
-index 30a7228eaceb..c3bd6cbfce4b 100644
---- a/arch/arm/kernel/entry-common.S
-+++ b/arch/arm/kernel/entry-common.S
-@@ -36,7 +36,9 @@ ret_fast_syscall:
+diff -Nur linux-4.4.28.orig/arch/arm/kernel/entry-common.S linux-4.4.28/arch/arm/kernel/entry-common.S
+--- linux-4.4.28.orig/arch/arm/kernel/entry-common.S	2016-10-28 09:53:25.000000000 +0200
++++ linux-4.4.28/arch/arm/kernel/entry-common.S	2016-11-01 21:26:56.764212578 +0100
+@@ -36,7 +36,9 @@
   UNWIND(.cantunwind	)
  	disable_irq_notrace			@ disable interrupts
  	ldr	r1, [tsk, #TI_FLAGS]		@ re-check for syscall tracing
@@ -496,7 +147,7 @@ index 30a7228eaceb..c3bd6cbfce4b 100644
  	bne	fast_work_pending
  
  	/* perform architecture specific actions before user return */
-@@ -62,8 +64,11 @@ ret_fast_syscall:
+@@ -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
@@ -509,11 +160,10 @@ index 30a7228eaceb..c3bd6cbfce4b 100644
   UNWIND(.fnend		)
  ENDPROC(ret_fast_syscall)
  
-diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
-index 4adfb46e3ee9..15f1d94b47c5 100644
---- a/arch/arm/kernel/process.c
-+++ b/arch/arm/kernel/process.c
-@@ -319,6 +319,30 @@ unsigned long arch_randomize_brk(struct mm_struct *mm)
+diff -Nur linux-4.4.28.orig/arch/arm/kernel/process.c linux-4.4.28/arch/arm/kernel/process.c
+--- linux-4.4.28.orig/arch/arm/kernel/process.c	2016-10-28 09:53:25.000000000 +0200
++++ linux-4.4.28/arch/arm/kernel/process.c	2016-11-01 21:26:56.772213095 +0100
+@@ -319,6 +319,30 @@
  }
  
  #ifdef CONFIG_MMU
@@ -544,11 +194,10 @@ index 4adfb46e3ee9..15f1d94b47c5 100644
  #ifdef CONFIG_KUSER_HELPERS
  /*
   * The vectors page is always readable from user space for the
-diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
-index 7b8f2141427b..96541e00b74a 100644
---- a/arch/arm/kernel/signal.c
-+++ b/arch/arm/kernel/signal.c
-@@ -572,7 +572,8 @@ do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall)
+diff -Nur linux-4.4.28.orig/arch/arm/kernel/signal.c linux-4.4.28/arch/arm/kernel/signal.c
+--- linux-4.4.28.orig/arch/arm/kernel/signal.c	2016-10-28 09:53:25.000000000 +0200
++++ linux-4.4.28/arch/arm/kernel/signal.c	2016-11-01 21:26:56.772213095 +0100
+@@ -572,7 +572,8 @@
  	 */
  	trace_hardirqs_off();
  	do {
@@ -558,11 +207,10 @@ index 7b8f2141427b..96541e00b74a 100644
  			schedule();
  		} else {
  			if (unlikely(!user_mode(regs)))
-diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
-index b26361355dae..e5754e3b03c4 100644
---- a/arch/arm/kernel/smp.c
-+++ b/arch/arm/kernel/smp.c
-@@ -230,8 +230,6 @@ int __cpu_disable(void)
+diff -Nur linux-4.4.28.orig/arch/arm/kernel/smp.c linux-4.4.28/arch/arm/kernel/smp.c
+--- linux-4.4.28.orig/arch/arm/kernel/smp.c	2016-10-28 09:53:25.000000000 +0200
++++ linux-4.4.28/arch/arm/kernel/smp.c	2016-11-01 21:26:56.772213095 +0100
+@@ -230,8 +230,6 @@
  	flush_cache_louis();
  	local_flush_tlb_all();
  
@@ -571,7 +219,7 @@ index b26361355dae..e5754e3b03c4 100644
  	return 0;
  }
  
-@@ -247,6 +245,9 @@ void __cpu_die(unsigned int cpu)
+@@ -247,6 +245,9 @@
  		pr_err("CPU%u: cpu didn't die\n", cpu);
  		return;
  	}
@@ -581,11 +229,10 @@ index b26361355dae..e5754e3b03c4 100644
  	pr_notice("CPU%u: shutdown\n", cpu);
  
  	/*
-diff --git a/arch/arm/kernel/unwind.c b/arch/arm/kernel/unwind.c
-index 0bee233fef9a..314cfb232a63 100644
---- a/arch/arm/kernel/unwind.c
-+++ b/arch/arm/kernel/unwind.c
-@@ -93,7 +93,7 @@ extern const struct unwind_idx __start_unwind_idx[];
+diff -Nur linux-4.4.28.orig/arch/arm/kernel/unwind.c linux-4.4.28/arch/arm/kernel/unwind.c
+--- linux-4.4.28.orig/arch/arm/kernel/unwind.c	2016-10-28 09:53:25.000000000 +0200
++++ linux-4.4.28/arch/arm/kernel/unwind.c	2016-11-01 21:26:56.776213352 +0100
+@@ -93,7 +93,7 @@
  static const struct unwind_idx *__origin_unwind_idx;
  extern const struct unwind_idx __stop_unwind_idx[];
  
@@ -594,7 +241,7 @@ index 0bee233fef9a..314cfb232a63 100644
  static LIST_HEAD(unwind_tables);
  
  /* Convert a prel31 symbol to an absolute address */
-@@ -201,7 +201,7 @@ static const struct unwind_idx *unwind_find_idx(unsigned long addr)
+@@ -201,7 +201,7 @@
  		/* module unwind tables */
  		struct unwind_table *table;
  
@@ -603,7 +250,7 @@ index 0bee233fef9a..314cfb232a63 100644
  		list_for_each_entry(table, &unwind_tables, list) {
  			if (addr >= table->begin_addr &&
  			    addr < table->end_addr) {
-@@ -213,7 +213,7 @@ static const struct unwind_idx *unwind_find_idx(unsigned long addr)
+@@ -213,7 +213,7 @@
  				break;
  			}
  		}
@@ -612,7 +259,7 @@ index 0bee233fef9a..314cfb232a63 100644
  	}
  
  	pr_debug("%s: idx = %p\n", __func__, idx);
-@@ -529,9 +529,9 @@ struct unwind_table *unwind_table_add(unsigned long start, unsigned long size,
+@@ -529,9 +529,9 @@
  	tab->begin_addr = text_addr;
  	tab->end_addr = text_addr + text_size;
  
@@ -624,7 +271,7 @@ index 0bee233fef9a..314cfb232a63 100644
  
  	return tab;
  }
-@@ -543,9 +543,9 @@ void unwind_table_del(struct unwind_table *tab)
+@@ -543,9 +543,9 @@
  	if (!tab)
  		return;
  
@@ -636,11 +283,10 @@ index 0bee233fef9a..314cfb232a63 100644
  
  	kfree(tab);
  }
-diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
-index e06fd299de08..bb43bc396f06 100644
---- a/arch/arm/kvm/arm.c
-+++ b/arch/arm/kvm/arm.c
-@@ -498,18 +498,18 @@ static void kvm_arm_resume_guest(struct kvm *kvm)
+diff -Nur linux-4.4.28.orig/arch/arm/kvm/arm.c linux-4.4.28/arch/arm/kvm/arm.c
+--- linux-4.4.28.orig/arch/arm/kvm/arm.c	2016-10-28 09:53:25.000000000 +0200
++++ linux-4.4.28/arch/arm/kvm/arm.c	2016-11-01 21:26:56.776213352 +0100
+@@ -496,18 +496,18 @@
  	struct kvm_vcpu *vcpu;
  
  	kvm_for_each_vcpu(i, vcpu, kvm) {
@@ -663,7 +309,7 @@ index e06fd299de08..bb43bc396f06 100644
  				       (!vcpu->arch.pause)));
  }
  
-@@ -568,7 +568,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)
+@@ -566,7 +566,7 @@
  		 * involves poking the GIC, which must be done in a
  		 * non-preemptible context.
  		 */
@@ -672,7 +318,7 @@ index e06fd299de08..bb43bc396f06 100644
  		kvm_timer_flush_hwstate(vcpu);
  		kvm_vgic_flush_hwstate(vcpu);
  
-@@ -587,7 +587,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)
+@@ -585,7 +585,7 @@
  			local_irq_enable();
  			kvm_timer_sync_hwstate(vcpu);
  			kvm_vgic_sync_hwstate(vcpu);
@@ -681,7 +327,7 @@ index e06fd299de08..bb43bc396f06 100644
  			continue;
  		}
  
-@@ -641,7 +641,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)
+@@ -639,7 +639,7 @@
  
  		kvm_vgic_sync_hwstate(vcpu);
  
@@ -690,11 +336,10 @@ index e06fd299de08..bb43bc396f06 100644
  
  		ret = handle_exit(vcpu, run, ret);
  	}
-diff --git a/arch/arm/kvm/psci.c b/arch/arm/kvm/psci.c
-index a9b3b905e661..c2b131527a64 100644
---- a/arch/arm/kvm/psci.c
-+++ b/arch/arm/kvm/psci.c
-@@ -70,7 +70,7 @@ static unsigned long kvm_psci_vcpu_on(struct kvm_vcpu *source_vcpu)
+diff -Nur linux-4.4.28.orig/arch/arm/kvm/psci.c linux-4.4.28/arch/arm/kvm/psci.c
+--- linux-4.4.28.orig/arch/arm/kvm/psci.c	2016-10-28 09:53:25.000000000 +0200
++++ linux-4.4.28/arch/arm/kvm/psci.c	2016-11-01 21:26:56.780213616 +0100
+@@ -70,7 +70,7 @@
  {
  	struct kvm *kvm = source_vcpu->kvm;
  	struct kvm_vcpu *vcpu = NULL;
@@ -703,7 +348,7 @@ index a9b3b905e661..c2b131527a64 100644
  	unsigned long cpu_id;
  	unsigned long context_id;
  	phys_addr_t target_pc;
-@@ -119,7 +119,7 @@ static unsigned long kvm_psci_vcpu_on(struct kvm_vcpu *source_vcpu)
+@@ -119,7 +119,7 @@
  	smp_mb();		/* Make sure the above is visible */
  
  	wq = kvm_arch_vcpu_wq(vcpu);
@@ -712,22 +357,9 @@ index a9b3b905e661..c2b131527a64 100644
  
  	return PSCI_RET_SUCCESS;
  }
-diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
-index 28656c2b54a0..3f501305ca26 100644
---- a/arch/arm/mach-at91/Kconfig
-+++ b/arch/arm/mach-at91/Kconfig
-@@ -99,6 +99,7 @@ config HAVE_AT91_USB_CLK
- config COMMON_CLK_AT91
- 	bool
- 	select COMMON_CLK
-+	select MFD_SYSCON
- 
- config HAVE_AT91_SMD
- 	bool
-diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c
-index c1a7c6cc00e1..63b4fa25b48a 100644
---- a/arch/arm/mach-at91/at91rm9200.c
-+++ b/arch/arm/mach-at91/at91rm9200.c
+diff -Nur linux-4.4.28.orig/arch/arm/mach-at91/at91rm9200.c linux-4.4.28/arch/arm/mach-at91/at91rm9200.c
+--- linux-4.4.28.orig/arch/arm/mach-at91/at91rm9200.c	2016-10-28 09:53:25.000000000 +0200
++++ linux-4.4.28/arch/arm/mach-at91/at91rm9200.c	2016-11-01 21:26:56.784213869 +0100
 @@ -12,7 +12,6 @@
  #include <linux/of_platform.h>
  
@@ -736,7 +368,7 @@ index c1a7c6cc00e1..63b4fa25b48a 100644
  
  #include "generic.h"
  #include "soc.h"
-@@ -33,7 +32,6 @@ static void __init at91rm9200_dt_device_init(void)
+@@ -33,7 +32,6 @@
  
  	of_platform_populate(NULL, of_default_bus_match_table, NULL, soc_dev);
  
@@ -744,11 +376,10 @@ index c1a7c6cc00e1..63b4fa25b48a 100644
  	at91rm9200_pm_init();
  }
  
-diff --git a/arch/arm/mach-at91/at91sam9.c b/arch/arm/mach-at91/at91sam9.c
-index 7eb64f763034..cada2a6412b3 100644
---- a/arch/arm/mach-at91/at91sam9.c
-+++ b/arch/arm/mach-at91/at91sam9.c
-@@ -62,8 +62,6 @@ static void __init at91sam9_common_init(void)
+diff -Nur linux-4.4.28.orig/arch/arm/mach-at91/at91sam9.c linux-4.4.28/arch/arm/mach-at91/at91sam9.c
+--- linux-4.4.28.orig/arch/arm/mach-at91/at91sam9.c	2016-10-28 09:53:25.000000000 +0200
++++ linux-4.4.28/arch/arm/mach-at91/at91sam9.c	2016-11-01 21:26:56.784213869 +0100
+@@ -62,8 +62,6 @@
  		soc_dev = soc_device_to_device(soc);
  
  	of_platform_populate(NULL, of_default_bus_match_table, NULL, soc_dev);
@@ -757,10 +388,9 @@ index 7eb64f763034..cada2a6412b3 100644
  }
  
  static void __init at91sam9_dt_device_init(void)
-diff --git a/arch/arm/mach-at91/generic.h b/arch/arm/mach-at91/generic.h
-index b0fa7dc7286d..28ca57a2060f 100644
---- a/arch/arm/mach-at91/generic.h
-+++ b/arch/arm/mach-at91/generic.h
+diff -Nur linux-4.4.28.orig/arch/arm/mach-at91/generic.h linux-4.4.28/arch/arm/mach-at91/generic.h
+--- linux-4.4.28.orig/arch/arm/mach-at91/generic.h	2016-10-28 09:53:25.000000000 +0200
++++ linux-4.4.28/arch/arm/mach-at91/generic.h	2016-11-01 21:26:56.784213869 +0100
 @@ -11,27 +11,18 @@
  #ifndef _AT91_GENERIC_H
  #define _AT91_GENERIC_H
@@ -791,10 +421,20 @@ index b0fa7dc7286d..28ca57a2060f 100644
  #endif
  
  #endif /* _AT91_GENERIC_H */
-diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
-index 23726fb31741..f06270198bf1 100644
---- a/arch/arm/mach-at91/pm.c
-+++ b/arch/arm/mach-at91/pm.c
+diff -Nur linux-4.4.28.orig/arch/arm/mach-at91/Kconfig linux-4.4.28/arch/arm/mach-at91/Kconfig
+--- linux-4.4.28.orig/arch/arm/mach-at91/Kconfig	2016-10-28 09:53:25.000000000 +0200
++++ linux-4.4.28/arch/arm/mach-at91/Kconfig	2016-11-01 21:26:56.784213869 +0100
+@@ -99,6 +99,7 @@
+ config COMMON_CLK_AT91
+ 	bool
+ 	select COMMON_CLK
++	select MFD_SYSCON
+ 
+ config HAVE_AT91_SMD
+ 	bool
+diff -Nur linux-4.4.28.orig/arch/arm/mach-at91/pm.c linux-4.4.28/arch/arm/mach-at91/pm.c
+--- linux-4.4.28.orig/arch/arm/mach-at91/pm.c	2016-10-28 09:53:25.000000000 +0200
++++ linux-4.4.28/arch/arm/mach-at91/pm.c	2016-11-01 21:26:56.788214125 +0100
 @@ -31,10 +31,13 @@
  #include <asm/mach/irq.h>
  #include <asm/fncpy.h>
@@ -809,7 +449,7 @@ index 23726fb31741..f06270198bf1 100644
  /*
   * FIXME: this is needed to communicate between the pinctrl driver and
   * the PM implementation in the machine. Possibly part of the PM
-@@ -87,7 +90,7 @@ static int at91_pm_verify_clocks(void)
+@@ -87,7 +90,7 @@
  	unsigned long scsr;
  	int i;
  
@@ -818,7 +458,7 @@ index 23726fb31741..f06270198bf1 100644
  
  	/* USB must not be using PLLB */
  	if ((scsr & at91_pm_data.uhp_udp_mask) != 0) {
-@@ -101,8 +104,7 @@ static int at91_pm_verify_clocks(void)
+@@ -101,8 +104,7 @@
  
  		if ((scsr & (AT91_PMC_PCK0 << i)) == 0)
  			continue;
@@ -828,7 +468,7 @@ index 23726fb31741..f06270198bf1 100644
  		if (css != AT91_PMC_CSS_SLOW) {
  			pr_err("AT91: PM - Suspend-to-RAM with PCK%d src %d\n", i, css);
  			return 0;
-@@ -145,8 +147,8 @@ static void at91_pm_suspend(suspend_state_t state)
+@@ -145,8 +147,8 @@
  	flush_cache_all();
  	outer_disable();
  
@@ -839,7 +479,7 @@ index 23726fb31741..f06270198bf1 100644
  
  	outer_resume();
  }
-@@ -353,6 +355,21 @@ static __init void at91_dt_ramc(void)
+@@ -353,6 +355,21 @@
  	at91_pm_set_standby(standby);
  }
  
@@ -861,7 +501,7 @@ index 23726fb31741..f06270198bf1 100644
  static void __init at91_pm_sram_init(void)
  {
  	struct gen_pool *sram_pool;
-@@ -399,13 +416,36 @@ static void __init at91_pm_sram_init(void)
+@@ -399,13 +416,36 @@
  			&at91_pm_suspend_in_sram, at91_pm_suspend_in_sram_sz);
  }
  
@@ -900,7 +540,7 @@ index 23726fb31741..f06270198bf1 100644
  	if (at91_suspend_sram_fn)
  		suspend_set_ops(&at91_pm_ops);
  	else
-@@ -424,7 +464,7 @@ void __init at91rm9200_pm_init(void)
+@@ -424,7 +464,7 @@
  	at91_pm_data.uhp_udp_mask = AT91RM9200_PMC_UHP | AT91RM9200_PMC_UDP;
  	at91_pm_data.memctrl = AT91_MEMCTRL_MC;
  
@@ -909,7 +549,7 @@ index 23726fb31741..f06270198bf1 100644
  }
  
  void __init at91sam9260_pm_init(void)
-@@ -432,7 +472,7 @@ void __init at91sam9260_pm_init(void)
+@@ -432,7 +472,7 @@
  	at91_dt_ramc();
  	at91_pm_data.memctrl = AT91_MEMCTRL_SDRAMC;
  	at91_pm_data.uhp_udp_mask = AT91SAM926x_PMC_UHP | AT91SAM926x_PMC_UDP;
@@ -918,7 +558,7 @@ index 23726fb31741..f06270198bf1 100644
  }
  
  void __init at91sam9g45_pm_init(void)
-@@ -440,7 +480,7 @@ void __init at91sam9g45_pm_init(void)
+@@ -440,7 +480,7 @@
  	at91_dt_ramc();
  	at91_pm_data.uhp_udp_mask = AT91SAM926x_PMC_UHP;
  	at91_pm_data.memctrl = AT91_MEMCTRL_DDRSDR;
@@ -927,7 +567,7 @@ index 23726fb31741..f06270198bf1 100644
  }
  
  void __init at91sam9x5_pm_init(void)
-@@ -448,5 +488,13 @@ void __init at91sam9x5_pm_init(void)
+@@ -448,5 +488,13 @@
  	at91_dt_ramc();
  	at91_pm_data.uhp_udp_mask = AT91SAM926x_PMC_UHP | AT91SAM926x_PMC_UDP;
  	at91_pm_data.memctrl = AT91_MEMCTRL_DDRSDR;
@@ -942,11 +582,10 @@ index 23726fb31741..f06270198bf1 100644
 +	at91_pm_data.memctrl = AT91_MEMCTRL_DDRSDR;
 +	at91_pm_init(NULL);
  }
-diff --git a/arch/arm/mach-at91/sama5.c b/arch/arm/mach-at91/sama5.c
-index d9cf6799aec0..df8fdf1cf66d 100644
---- a/arch/arm/mach-at91/sama5.c
-+++ b/arch/arm/mach-at91/sama5.c
-@@ -51,7 +51,7 @@ static void __init sama5_dt_device_init(void)
+diff -Nur linux-4.4.28.orig/arch/arm/mach-at91/sama5.c linux-4.4.28/arch/arm/mach-at91/sama5.c
+--- linux-4.4.28.orig/arch/arm/mach-at91/sama5.c	2016-10-28 09:53:25.000000000 +0200
++++ linux-4.4.28/arch/arm/mach-at91/sama5.c	2016-11-01 21:26:56.788214125 +0100
+@@ -51,7 +51,7 @@
  		soc_dev = soc_device_to_device(soc);
  
  	of_platform_populate(NULL, of_default_bus_match_table, NULL, soc_dev);
@@ -955,11 +594,10 @@ index d9cf6799aec0..df8fdf1cf66d 100644
  }
  
  static const char *const sama5_dt_board_compat[] __initconst = {
-diff --git a/arch/arm/mach-exynos/platsmp.c b/arch/arm/mach-exynos/platsmp.c
-index 98a2c0cbb833..310dce500d3e 100644
---- a/arch/arm/mach-exynos/platsmp.c
-+++ b/arch/arm/mach-exynos/platsmp.c
-@@ -230,7 +230,7 @@ static void __iomem *scu_base_addr(void)
+diff -Nur linux-4.4.28.orig/arch/arm/mach-exynos/platsmp.c linux-4.4.28/arch/arm/mach-exynos/platsmp.c
+--- linux-4.4.28.orig/arch/arm/mach-exynos/platsmp.c	2016-10-28 09:53:25.000000000 +0200
++++ linux-4.4.28/arch/arm/mach-exynos/platsmp.c	2016-11-01 21:26:56.796214642 +0100
+@@ -230,7 +230,7 @@
  	return (void __iomem *)(S5P_VA_SCU);
  }
  
@@ -968,7 +606,7 @@ index 98a2c0cbb833..310dce500d3e 100644
  
  static void exynos_secondary_init(unsigned int cpu)
  {
-@@ -243,8 +243,8 @@ static void exynos_secondary_init(unsigned int cpu)
+@@ -243,8 +243,8 @@
  	/*
  	 * Synchronise with the boot thread.
  	 */
@@ -979,7 +617,7 @@ index 98a2c0cbb833..310dce500d3e 100644
  }
  
  int exynos_set_boot_addr(u32 core_id, unsigned long boot_addr)
-@@ -308,7 +308,7 @@ static int exynos_boot_secondary(unsigned int cpu, struct task_struct *idle)
+@@ -308,7 +308,7 @@
  	 * Set synchronisation state between this boot processor
  	 * and the secondary one
  	 */
@@ -988,7 +626,7 @@ index 98a2c0cbb833..310dce500d3e 100644
  
  	/*
  	 * The secondary processor is waiting to be released from
-@@ -335,7 +335,7 @@ static int exynos_boot_secondary(unsigned int cpu, struct task_struct *idle)
+@@ -335,7 +335,7 @@
  
  		if (timeout == 0) {
  			printk(KERN_ERR "cpu1 power enable failed");
@@ -997,7 +635,7 @@ index 98a2c0cbb833..310dce500d3e 100644
  			return -ETIMEDOUT;
  		}
  	}
-@@ -381,7 +381,7 @@ static int exynos_boot_secondary(unsigned int cpu, struct task_struct *idle)
+@@ -381,7 +381,7 @@