diff options
| author | Joel Stanley <joel@jms.id.au> | 2018-02-01 08:41:49 +1030 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2018-02-01 08:41:49 +1030 |
| commit | 2f3fa07057b7abff18b0f13e04677a7dd1efd8eb (patch) | |
| tree | f00b193b58f51d43402c7d06a4bec7b4a066638f /openpower/linux | |
| parent | 38cfc3293089917fc361cb0f3c9208c36f456b16 (diff) | |
| download | blackbird-op-build-2f3fa07057b7abff18b0f13e04677a7dd1efd8eb.tar.gz blackbird-op-build-2f3fa07057b7abff18b0f13e04677a7dd1efd8eb.zip | |
kernel: Move to Linux 4.14.16-openpower1
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'openpower/linux')
| -rw-r--r-- | openpower/linux/0002-powerpc-64s-Add-workaround-for-P9-vector-CI-load-iss.patch | 10 | ||||
| -rw-r--r-- | openpower/linux/0003-Release-OpenPower-kernel.patch | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/openpower/linux/0002-powerpc-64s-Add-workaround-for-P9-vector-CI-load-iss.patch b/openpower/linux/0002-powerpc-64s-Add-workaround-for-P9-vector-CI-load-iss.patch index a0d90697..3f6630d5 100644 --- a/openpower/linux/0002-powerpc-64s-Add-workaround-for-P9-vector-CI-load-iss.patch +++ b/openpower/linux/0002-powerpc-64s-Add-workaround-for-P9-vector-CI-load-iss.patch @@ -57,7 +57,7 @@ index f00e10e2a335..651e1354498e 100644 } ppc_emulated; diff --git a/arch/powerpc/include/asm/paca.h b/arch/powerpc/include/asm/paca.h -index 04b60af027ae..1e06310ccc09 100644 +index b8366df50d19..c9fff7b45691 100644 --- a/arch/powerpc/include/asm/paca.h +++ b/arch/powerpc/include/asm/paca.h @@ -210,6 +210,7 @@ struct paca_struct { @@ -97,10 +97,10 @@ index 11f4bd07cce0..1e6ead577459 100644 __asm__ __volatile__( \ "1: "op" %1,0(%2) # get_user\n" \ diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S -index 06598142d755..7ac85fde9ece 100644 +index e9f72abc52b7..2dcfe36ee247 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S -@@ -1033,6 +1033,8 @@ TRAMP_REAL_BEGIN(hmi_exception_early) +@@ -1060,6 +1060,8 @@ TRAMP_REAL_BEGIN(hmi_exception_early) EXCEPTION_PROLOG_COMMON_3(0xe60) addi r3,r1,STACK_FRAME_OVERHEAD BRANCH_LINK_TO_FAR(hmi_exception_realmode) /* Function call ABI */ @@ -109,7 +109,7 @@ index 06598142d755..7ac85fde9ece 100644 /* Windup the stack. */ /* Move original HSRR0 and HSRR1 into the respective regs */ ld r9,_MSR(r1) -@@ -1049,10 +1051,15 @@ TRAMP_REAL_BEGIN(hmi_exception_early) +@@ -1076,10 +1078,15 @@ TRAMP_REAL_BEGIN(hmi_exception_early) REST_8GPRS(2, r1) REST_GPR(10, r1) ld r11,_CCR(r1) @@ -127,7 +127,7 @@ index 06598142d755..7ac85fde9ece 100644 ld r1,GPR1(r1) /* -@@ -1065,8 +1072,9 @@ hmi_exception_after_realmode: +@@ -1092,8 +1099,9 @@ hmi_exception_after_realmode: EXCEPTION_PROLOG_0(PACA_EXGEN) b tramp_real_hmi_exception diff --git a/openpower/linux/0003-Release-OpenPower-kernel.patch b/openpower/linux/0003-Release-OpenPower-kernel.patch index fd81e274..30818403 100644 --- a/openpower/linux/0003-Release-OpenPower-kernel.patch +++ b/openpower/linux/0003-Release-OpenPower-kernel.patch @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Joel Stanley <joel@jms.id.au> -Date: Tue, 16 Jan 2018 10:05:56 -0600 +Date: Thu, 1 Feb 2018 08:37:13 +1030 Subject: [PATCH 3/3] Release OpenPower kernel Signed-off-by: Joel Stanley <joel@jms.id.au> @@ -9,13 +9,13 @@ Signed-off-by: Joel Stanley <joel@jms.id.au> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index a67c5179052a..24bdd9b61124 100644 +index 90a4bffa8446..21b1d16a9545 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ VERSION = 4 PATCHLEVEL = 14 - SUBLEVEL = 13 + SUBLEVEL = 16 -EXTRAVERSION = +EXTRAVERSION = -openpower1 NAME = Petit Gorille |
