Merge tag ‘powerpc-5.1-6’ of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux [Linux 5.1]

Merge tag ‘powerpc-5.1-6’ of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux [Linux 5.1]

This Linux kernel change "Merge tag ‘powerpc-5.1-6’ of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux" is included in the Linux 5.1 release. This change is authored by Linus Torvalds <torvalds [at] linux-foundation.org> on Sun Apr 28 10:43:15 2019 -0700. The commit for this change in Linux stable tree is 0d82044 (patch). Other info about this change: Merge: 975a0f4 7a3a4d7

Merge tag 'powerpc-5.1-6' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

Pull powerpc fixes from Michael Ellerman:
 "A one-liner to make our Radix MMU support depend on HUGETLB_PAGE. We
  use some of the hugetlb inlines (eg. pud_huge()) when operating on the
  linear mapping and if they're compiled into empty wrappers we can
  corrupt memory.

  Then two fixes to our VFIO IOMMU code. The first is not a regression
  but fixes the locking to avoid a user-triggerable deadlock.

  The second does fix a regression since rc1, and depends on the first
  fix. It makes it possible to run guests with large amounts of memory
  again (~256GB).

  Thanks to Alexey Kardashevskiy"

* tag 'powerpc-5.1-6' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/mm_iommu: Allow pinning large regions
  powerpc/mm_iommu: Fix potential deadlock
  powerpc/mm/radix: Make Radix require HUGETLB_PAGE

There is no are 0 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 drivers/net/slip/slhc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/slip/slhc.c b/drivers/net/slip/slhc.c
index f4e93f5..ea90db3 100644
--- a/drivers/net/slip/slhc.c
+++ b/drivers/net/slip/slhc.c
@@ -153,7 +153,7 @@ struct slcompress *
 void
 slhc_free(struct slcompress *comp)
 {
-   if ( comp == NULLSLCOMPR )
+   if ( IS_ERR_OR_NULL(comp) )
        return;

    if ( comp->tstate != NULLSLSTATE )

Leave a Reply

Your email address will not be published. Required fields are marked *