Commit d665ea6e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml 

Pull UML updates from Richard Weinberger:

 - Disable CONFIG_GCOV when built with modules

 - Many fixes for W=1 related warnings

 - Code cleanup

* tag 'for-linus-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
  um: Fix W=1 missing-include-dirs warnings
  um: elf.h: Fix W=1 warning for empty body in 'do' statement
  um: pgtable.h: Fix W=1 warning for empty body in 'do' statement
  um: Remove unused including <linux/version.h>
  um: Add 2 missing libs to fix various build errors
  um: Replace if (cond) BUG() with BUG_ON()
  um: Disable CONFIG_GCOV with MODULES
  um: Remove unneeded variable 'ret'
  um: Mark all kernel symbols as local
  um: Fix tag order in stub_32.h
parents 51f62944 ed102bf2

arch/um/Kconfig.debug

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ config GCOV 
	bool "Enable gcov support"

	depends on DEBUG_INFO

	depends on !KCOV

	depends on !MODULES

	help

	  This option allows developers to retrieve coverage data from a UML

	  session.

arch/um/drivers/hostaudio_kern.c

+1 −3
Original line number Diff line number Diff line
@@ -122,13 +122,11 @@ static ssize_t hostaudio_write(struct file *file, const char __user *buffer, 
static __poll_t hostaudio_poll(struct file *file,

				struct poll_table_struct *wait)

{

	__poll_t mask = 0;



#ifdef DEBUG

	printk(KERN_DEBUG "hostaudio: poll called (unimplemented)\n");

#endif



	return mask;

	return 0;

}



static long hostaudio_ioctl(struct file *file,

arch/um/drivers/vector_kern.c

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ 
 * Copyright (C) 2001 by various other people who didn't put their name here.

 */



#include <linux/version.h>

#include <linux/memblock.h>

#include <linux/etherdevice.h>

#include <linux/ethtool.h>

arch/um/include/asm/pgtable.h

+1 −1
Original line number Diff line number Diff line
@@ -302,7 +302,7 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) 
struct mm_struct;

extern pte_t *virt_to_pte(struct mm_struct *mm, unsigned long addr);



#define update_mmu_cache(vma,address,ptep) do ; while (0)

#define update_mmu_cache(vma,address,ptep) do {} while (0)



/* Encode and de-code a swap entry */

#define __swp_type(x)			(((x).val >> 5) & 0x1f)

arch/um/include/uapi/asm/Kbuild

0 → 100644
+1 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0