[PATCH 04/13] MIPS: zboot: fix 'make clean' failure

From	Arnd Bergmann <arnd@arndb.de>
Newsgroups	linux.kernel
Subject	[PATCH 04/13] MIPS: zboot: fix 'make clean' failure
Date	2017-01-17 16:30 +0100
Message-ID	<t0DRU-jr-1@gated-at.bofh.it> (permalink)
References	<t0DRU-jr-3@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

The filter-out macro needs two arguments, passing only one is
clearly the result of a typo that leads to 'make clean' failing
on MIPS:

arch/mips/boot/compressed/Makefile:21: *** insufficient number of arguments (1) to function 'filter-out'.  Stop.

Fixes: afca036d463c ("MIPS: zboot: Consolidate compiler flag filtering.")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 arch/mips/boot/compressed/Makefile | 2 +-
 arch/mips/include/asm/uaccess.h    | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/arch/mips/boot/compressed/Makefile b/arch/mips/boot/compressed/Makefile
index 608389a4a418..c675eece389a 100644
--- a/arch/mips/boot/compressed/Makefile
+++ b/arch/mips/boot/compressed/Makefile
@@ -18,7 +18,7 @@ include $(srctree)/arch/mips/Kbuild.platforms
 BOOT_HEAP_SIZE := 0x400000
 
 # Disable Function Tracer
-KBUILD_CFLAGS := $(filter-out -pg $(KBUILD_CFLAGS))
+KBUILD_CFLAGS := $(filter-out -pg, $(KBUILD_CFLAGS))
 
 KBUILD_CFLAGS := $(filter-out -fstack-protector, $(KBUILD_CFLAGS))
 
diff --git a/arch/mips/include/asm/uaccess.h b/arch/mips/include/asm/uaccess.h
index 5347cfe15af2..c66db8169af9 100644
--- a/arch/mips/include/asm/uaccess.h
+++ b/arch/mips/include/asm/uaccess.h
@@ -80,6 +80,9 @@ extern u64 __ua_limit;
 
 #define segment_eq(a, b)	((a).seg == (b).seg)
 
+extern size_t __copy_user_inatomic(void *__to, const void *__from, size_t __n);
+extern size_t __copy_user(void *__to, const void *__from, size_t __n);
+
 /*
  * eva_kernel_access() - determine whether kernel memory access on an EVA system
  *
-- 
2.9.0

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH 04/13] MIPS: zboot: fix 'make clean' failure Arnd Bergmann <arnd@arndb.de> - 2017-01-17 16:30 +0100
  Re: [PATCH 04/13] MIPS: zboot: fix 'make clean' failure Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> - 2017-01-18 10:50 +0100
    Re: [PATCH 04/13] MIPS: zboot: fix 'make clean' failure Arnd Bergmann <arnd@arndb.de> - 2017-01-18 11:20 +0100

csiph-web