linux-s390.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] KVM: s390/mm: fix up indentation of set_guest_storage_key
@ 2014-08-27 10:20 Christian Borntraeger
  2014-08-27 14:35 ` Paolo Bonzini
  0 siblings, 1 reply; 2+ messages in thread
From: Christian Borntraeger @ 2014-08-27 10:20 UTC (permalink / raw)
  To: Paolo Bonzini
  Cc: KVM, Gleb Natapov, Alexander Graf, Cornelia Huck, Jens Freimann,
	linux-s390, ben, Christian Borntraeger

commit ab3f285f227f ("KVM: s390/mm: try a cow on read only pages for
key ops")' misaligned a code block. Let's fixup the indentation.

Reported-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
---
 arch/s390/mm/pgtable.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/s390/mm/pgtable.c b/arch/s390/mm/pgtable.c
index 5404a62..1570dbd 100644
--- a/arch/s390/mm/pgtable.c
+++ b/arch/s390/mm/pgtable.c
@@ -994,13 +994,13 @@ retry:
 	}
 	if (!(pte_val(*ptep) & _PAGE_INVALID) &&
 	     (pte_val(*ptep) & _PAGE_PROTECT)) {
-			pte_unmap_unlock(*ptep, ptl);
-			if (fixup_user_fault(current, mm, addr, FAULT_FLAG_WRITE)) {
-				up_read(&mm->mmap_sem);
-				return -EFAULT;
-			}
-			goto retry;
+		pte_unmap_unlock(*ptep, ptl);
+		if (fixup_user_fault(current, mm, addr, FAULT_FLAG_WRITE)) {
+			up_read(&mm->mmap_sem);
+			return -EFAULT;
 		}
+		goto retry;
+	}
 
 	new = old = pgste_get_lock(ptep);
 	pgste_val(new) &= ~(PGSTE_GR_BIT | PGSTE_GC_BIT |
-- 
1.8.4.2

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] KVM: s390/mm: fix up indentation of set_guest_storage_key
  2014-08-27 10:20 [PATCH] KVM: s390/mm: fix up indentation of set_guest_storage_key Christian Borntraeger
@ 2014-08-27 14:35 ` Paolo Bonzini
  0 siblings, 0 replies; 2+ messages in thread
From: Paolo Bonzini @ 2014-08-27 14:35 UTC (permalink / raw)
  To: Christian Borntraeger
  Cc: KVM, Gleb Natapov, Alexander Graf, Cornelia Huck, Jens Freimann,
	linux-s390, ben

Il 27/08/2014 12:20, Christian Borntraeger ha scritto:
> commit ab3f285f227f ("KVM: s390/mm: try a cow on read only pages for
> key ops")' misaligned a code block. Let's fixup the indentation.
> 
> Reported-by: Ben Hutchings <ben@decadent.org.uk>
> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
> ---
>  arch/s390/mm/pgtable.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/arch/s390/mm/pgtable.c b/arch/s390/mm/pgtable.c
> index 5404a62..1570dbd 100644
> --- a/arch/s390/mm/pgtable.c
> +++ b/arch/s390/mm/pgtable.c
> @@ -994,13 +994,13 @@ retry:
>  	}
>  	if (!(pte_val(*ptep) & _PAGE_INVALID) &&
>  	     (pte_val(*ptep) & _PAGE_PROTECT)) {
> -			pte_unmap_unlock(*ptep, ptl);
> -			if (fixup_user_fault(current, mm, addr, FAULT_FLAG_WRITE)) {
> -				up_read(&mm->mmap_sem);
> -				return -EFAULT;
> -			}
> -			goto retry;
> +		pte_unmap_unlock(*ptep, ptl);
> +		if (fixup_user_fault(current, mm, addr, FAULT_FLAG_WRITE)) {
> +			up_read(&mm->mmap_sem);
> +			return -EFAULT;
>  		}
> +		goto retry;
> +	}
>  
>  	new = old = pgste_get_lock(ptep);
>  	pgste_val(new) &= ~(PGSTE_GR_BIT | PGSTE_GC_BIT |
> 

Applying this patch, thanks.

Paolo

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2014-08-27 14:35 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-08-27 10:20 [PATCH] KVM: s390/mm: fix up indentation of set_guest_storage_key Christian Borntraeger
2014-08-27 14:35 ` Paolo Bonzini

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).