Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1560695 > unrolled thread

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

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.

Contents

  [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

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

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

[toc] | [next] | [standalone]

#1561398

Hello!

On 1/17/2017 6:18 PM, Arnd Bergmann wrote:

> 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>
[...]
> 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
>   *

    Unrelated change?

MBR, Sergei

[toc] | [prev] | [next] | [standalone]

#1561452

On Wed, Jan 18, 2017 at 10:43 AM, Sergei Shtylyov
<sergei.shtylyov@cogentembedded.com> wrote:
> On 1/17/2017 6:18 PM, Arnd Bergmann wrote:
>> 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
>>   *
>
>
>    Unrelated change?

Sorry, my mistake. That was meant to be part of "MIPS: Fix
modversions". I'll send this separately once the kernelci bot has some
results for today's linux-next.

    Arnd

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web