From 73ed4e477f7c68add8460081b7ac8b79d6aa5806 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 9 Jun 2013 20:16:14 +0000 Subject: [PATCH] [s390] Add pgste to ptep_modify_prot_start() Fixes build breakage in 3.9.5. svn path=/dists/sid/linux/; revision=20219 --- debian/changelog | 2 ++ ...-add-pgste-to-ptep_modify_prot_start.patch | 30 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 33 insertions(+) create mode 100644 debian/patches/bugfix/s390/s390-add-pgste-to-ptep_modify_prot_start.patch diff --git a/debian/changelog b/debian/changelog index 286be34c9..f3d8a6c99 100644 --- a/debian/changelog +++ b/debian/changelog @@ -47,6 +47,8 @@ linux (3.9.5-1) UNRELEASED; urgency=low [ Ben Hutchings ] * [powerpcspe] Remove installer udebs (really fixes FTBFS) + * [s390] Add pgste to ptep_modify_prot_start() + -- Ben Hutchings Sat, 08 Jun 2013 15:25:11 +0100 diff --git a/debian/patches/bugfix/s390/s390-add-pgste-to-ptep_modify_prot_start.patch b/debian/patches/bugfix/s390/s390-add-pgste-to-ptep_modify_prot_start.patch new file mode 100644 index 000000000..c81626353 --- /dev/null +++ b/debian/patches/bugfix/s390/s390-add-pgste-to-ptep_modify_prot_start.patch @@ -0,0 +1,30 @@ +From: Ben Hutchings +Date: Sun, 09 Jun 2013 16:54:12 +0100 +Subject: s390: Add pgste to ptep_modify_prot_start() +Forwarded: http://article.gmane.org/gmane.linux.kernel.stable/55564 + +Commit 52f36be0f4e2 's390/pgtable: Fix check for pgste/storage key +handling', which was commit b56433cb782d upstream, added a use of +pgste to ptep_modify_prot_start(), but this variable does not exist. +In mainline, pgste was added by commit d3383632d4e8 's390/mm: add pte +invalidation notifier for kvm' and initialised to the return value of +pgste_get_lock(ptep). Initialise it similarly here. + +Signed-off-by: Ben Hutchings +--- +--- a/arch/s390/include/asm/pgtable.h ++++ b/arch/s390/include/asm/pgtable.h +@@ -1063,11 +1063,12 @@ static inline pte_t ptep_modify_prot_sta + unsigned long address, + pte_t *ptep) + { ++ pgste_t pgste; + pte_t pte; + + mm->context.flush_mm = 1; + if (mm_has_pgste(mm)) +- pgste_get_lock(ptep); ++ pgste = pgste_get_lock(ptep); + + pte = *ptep; + if (!mm_exclusive(mm)) diff --git a/debian/patches/series b/debian/patches/series index cd730a4ec..db514cde8 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -104,3 +104,4 @@ features/arm/imx53-qsb-usb-power.patch features/arm/0001-thermal-Add-driver-for-Armada-370-XP-SoC-thermal-man.patch features/arm/0001-ARM-mvebu-Add-thermal-support-to-Armada-XP-device-tr.patch +bugfix/s390/s390-add-pgste-to-ptep_modify_prot_start.patch