jianhai / rpms / kernel

Forked from rpms/kernel 3 years ago
Clone
e293be
Replace this with previous upstream-32bit-fixes-7_4.patch .
e293be
e293be
diff -up ./drivers/scsi/qla2xxx/qla_init.c.int ./drivers/scsi/qla2xxx/qla_init.c
e293be
--- ./drivers/scsi/qla2xxx/qla_init.c.int	2018-03-22 06:40:12.000000000 +0900
e293be
+++ ./drivers/scsi/qla2xxx/qla_init.c	2018-04-15 22:53:13.000000000 +0900
e293be
@@ -6835,8 +6835,8 @@ qla24xx_load_risc_blob(scsi_qla_host_t *
e293be
 	ha->fw_dump_template_len = 0;
e293be
 
e293be
 	ql_dbg(ql_dbg_init, vha, 0x171,
e293be
-	    "Loading fwdump template from %lx\n",
e293be
-	    (void *)fwcode - (void *)blob->fw->data);
e293be
+	    "Loading fwdump template from %x\n",
e293be
+	    (uint32_t)((void *)fwcode - (void *)blob->fw->data));
e293be
 	risc_size = be32_to_cpu(fwcode[2]);
e293be
 	ql_dbg(ql_dbg_init, vha, 0x172,
e293be
 	    "-> array size %x dwords\n", risc_size);
e293be
--
e293be
1.8.3.1
e293be
e293be
From b9469523631bd376a5f877d4e816f3a81c12b790 Mon Sep 17 00:00:00 2001
e293be
From: Paul Bolle <pebolle@tiscali.nl>
e293be
Date: Mon, 30 Jun 2014 16:32:29 +0200
e293be
Subject: [PATCH] x86: Remove unused variable "polling"
e293be
e293be
Compile tested. "polling" is unused since commit f80c5b39b80a
e293be
("sched/idle, x86: Switch from TS_POLLING to TIF_POLLING_NRFLAG").
e293be
e293be
Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
e293be
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
e293be
Cc: Jiri Kosina <jkosina@suse.cz>
e293be
Link: http://lkml.kernel.org/r/1404138749.2978.6.camel@x41
e293be
Signed-off-by: Ingo Molnar <mingo@kernel.org>
e293be
---
e293be
 arch/x86/kernel/apm_32.c | 1 -
e293be
 1 file changed, 1 deletion(-)
e293be
e293be
diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
e293be
index 8fdcec6..66d3b1f 100644
e293be
--- a/arch/x86/kernel/apm_32.c
e293be
+++ b/arch/x86/kernel/apm_32.c
e293be
@@ -841,7 +841,6 @@ static int apm_do_idle(void)
e293be
 	u32 eax;
e293be
 	u8 ret = 0;
e293be
 	int idled = 0;
e293be
-	int polling;
e293be
 	int err = 0;
e293be
 
e293be
 	if (!need_resched()) {
e293be
-- 
e293be
1.8.3.1
e293be
e293be
From 75c2e0e53d2fb5df66b8fe162d71930348ac0b96 Mon Sep 17 00:00:00 2001
e293be
From: John Stultz <john.stultz@linaro.org>
e293be
Date: Wed, 16 Jul 2014 21:03:56 +0000
e293be
Subject: [PATCH] ktime: Change ktime_set() to take 64bit seconds value
e293be
e293be
In order to support dates past 2038 on 32bit systems, ktime_set()
e293be
needs to handle 64bit second values.
e293be
e293be
[ tglx: Removed the BITS_PER_LONG check ]
e293be
e293be
Signed-off-by: John Stultz <john.stultz@linaro.org>
e293be
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
e293be
Signed-off-by: John Stultz <john.stultz@linaro.org>
e293be
---
e293be
 include/linux/ktime.h | 7 +++----
e293be
 1 file changed, 3 insertions(+), 4 deletions(-)
e293be
e293be
diff --git a/include/linux/ktime.h b/include/linux/ktime.h
e293be
index e4e9a9f..6950c96 100644
e293be
--- a/include/linux/ktime.h
e293be
+++ b/include/linux/ktime.h
e293be
@@ -71,13 +71,12 @@ typedef union ktime ktime_t;		/* Kill this */
e293be
  *
e293be
  * Return the ktime_t representation of the value
e293be
  */
e293be
-static inline ktime_t ktime_set(const long secs, const unsigned long nsecs)
e293be
+static inline ktime_t ktime_set(const s64 secs, const unsigned long nsecs)
e293be
 {
e293be
-#if (BITS_PER_LONG == 64)
e293be
 	if (unlikely(secs >= KTIME_SEC_MAX))
e293be
 		return (ktime_t){ .tv64 = KTIME_MAX };
e293be
-#endif
e293be
-	return (ktime_t) { .tv64 = (s64)secs * NSEC_PER_SEC + (s64)nsecs };
e293be
+
e293be
+	return (ktime_t) { .tv64 = secs * NSEC_PER_SEC + (s64)nsecs };
e293be
 }
e293be
 
e293be
 /* Subtract two ktime_t variables. rem = lhs -rhs: */
e293be
-- 
e293be
1.8.3.1
e293be
e293be
From 80a667f7ab1beee42b31e263ba4681fdfe00a0b6 Mon Sep 17 00:00:00 2001
e293be
From: Florian Westphal <fw@strlen.de>
e293be
Date: Wed, 17 Jun 2015 23:58:28 +0200
e293be
Subject: [PATCH] netfilter: xtables: fix warnings on 32bit platforms
e293be
e293be
On 32bit archs gcc complains due to cast from void* to u64.
e293be
Add intermediate casts to long to silence these warnings.
e293be
e293be
include/linux/netfilter/x_tables.h:376:10: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
e293be
include/linux/netfilter/x_tables.h:384:15: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
e293be
include/linux/netfilter/x_tables.h:391:23: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
e293be
include/linux/netfilter/x_tables.h:400:22: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
e293be
e293be
Fixes: 71ae0dff02d756e ("netfilter: xtables: use percpu rule counters")
e293be
Reported-by: kbuild test robot <fengguang.wu@intel.com>
e293be
Signed-off-by: Florian Westphal <fw@strlen.de>
e293be
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
e293be
---
e293be
 include/linux/netfilter/x_tables.h | 8 ++++----
e293be
 1 file changed, 4 insertions(+), 4 deletions(-)
e293be
e293be
diff -up ./include/linux/netfilter/x_tables.h.int ./include/linux/netfilter/x_tables.h
e293be
--- ./include/linux/netfilter/x_tables.h.int	2018-03-22 06:40:12.000000000 +0900
e293be
+++ ./include/linux/netfilter/x_tables.h	2018-04-15 23:09:40.000000000 +0900
e293be
@@ -381,7 +381,7 @@ static inline struct xt_counters *
e293be
 xt_get_this_cpu_counter(struct xt_counters *cnt)
e293be
 {
e293be
 	if (nr_cpu_ids > 1)
e293be
-		return this_cpu_ptr((void __percpu *) cnt->pcnt);
e293be
+		return this_cpu_ptr((void __percpu *) (unsigned long) cnt->pcnt);
e293be
 
e293be
 	return cnt;
e293be
 }
e293be
@@ -390,7 +390,7 @@ static inline struct xt_counters *
e293be
 xt_get_per_cpu_counter(struct xt_counters *cnt, unsigned int cpu)
e293be
 {
e293be
 	if (nr_cpu_ids > 1)
e293be
-		return per_cpu_ptr((void __percpu *) cnt->pcnt, cpu);
e293be
+		return per_cpu_ptr((void __percpu *) (unsigned long) cnt->pcnt, cpu);
e293be
 
e293be
 	return cnt;
e293be
 }