Merge tag ‘selinux-pr-20190429’ of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux [Linux 5.1]

Merge tag ‘selinux-pr-20190429’ of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux [Linux 5.1]

This Linux kernel change "Merge tag ‘selinux-pr-20190429’ of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux" is included in the Linux 5.1 release. This change is authored by Linus Torvalds <torvalds [at] linux-foundation.org> on Tue Apr 30 08:38:02 2019 -0700. The commit for this change in Linux stable tree is fea27bc (patch). Other info about this change: Merge: 83a5084 dfbd199

Merge tag 'selinux-pr-20190429' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux

Pull selinux fix from Paul Moore:
 "One small patch for the stable folks to fix a problem when building
  against the latest glibc.

  I'll be honest and say that I'm not really thrilled with the idea of
  sending this up right now, but Greg is a little annoyed so here I
  figured I would at least send this"

* tag 'selinux-pr-20190429' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux:
  selinux: use kernel linux/socket.h for genheaders and mdp

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

 arch/x86/include/asm/pgtable.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
index 2779ace..50b3e2d 100644
--- a/arch/x86/include/asm/pgtable.h
+++ b/arch/x86/include/asm/pgtable.h
@@ -46,7 +46,7 @@
  */
 extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)]
    __visible;
-#define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page))
+#define ZERO_PAGE(vaddr) ((void)(vaddr),virt_to_page(empty_zero_page))

 extern spinlock_t pgd_lock;
 extern struct list_head pgd_list;

Leave a Reply

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