Commit 2b603cd5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm 

Pull ARM updates from Russell King:

 - lots of build cleanups from Arnd spread throughout the arch/arm tree

 - replace strlcpy() with the preferred strscpy()

 - use sign_extend32() in the module linker

 - drop handle_irq() machine descriptor method

* tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: 9315/1: fiq: include asm/mach/irq.h for prototypes
  ARM: 9314/1: tcm: move tcm_init() prototype to asm/tcm.h
  ARM: 9313/1: vdso: add missing prototypes
  ARM: 9312/1: vfp: include asm/neon.h in vfpmodule.c
  ARM: 9311/1: decompressor: move function prototypes to misc.h
  ARM: 9310/1: xip-kernel: add __inflate_kernel_data prototype
  ARM: 9309/1: add missing syscall prototypes
  ARM: 9308/1: move setup functions to header
  ARM: 9307/1: nommu: include asm/idmap.h
  ARM: 9306/1: cacheflush: avoid __flush_anon_page() missing-prototype warning
  ARM: 9305/1: add clear/copy_user_highpage declarations
  ARM: 9304/1: add prototype for function called only from asm
  ARM: 9303/1: kprobes: avoid missing-declaration warnings
  ARM: 9302/1: traps: hide unused functions on NOMMU
  ARM: 9301/1: dma-mapping: hide unused dma_contiguous_early_fixup function
  ARM: 9300/1: Replace all non-returning strlcpy with strscpy
  ARM: 9299/1: module: use sign_extend32() to extend the signedness
  ARM: 9298/1: Drop custom mdesc->handle_irq()
parents f810c182 85e18ed3

arch/arm/boot/compressed/atags_to_fdt.c

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#include <linux/libfdt_env.h>

#include <asm/setup.h>

#include <libfdt.h>

#include "misc.h"



#if defined(CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND)

#define do_extend_cmdline 1

arch/arm/boot/compressed/fdt_check_mem_start.c

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
#include <linux/kernel.h>

#include <linux/libfdt.h>

#include <linux/sizes.h>

#include "misc.h"



static const void *get_prop(const void *fdt, const char *node_path,

			    const char *property, int minlen)

arch/arm/boot/compressed/misc.c

+0 −6
Original line number Diff line number Diff line
@@ -103,9 +103,6 @@ static void putstr(const char *ptr) 
/*

 * gzip declarations

 */

extern char input_data[];

extern char input_data_end[];



unsigned char *output_data;



unsigned long free_mem_ptr;
@@ -131,9 +128,6 @@ asmlinkage void __div0(void) 
	error("Attempting division by 0!");

}



extern int do_decompress(u8 *input, int len, u8 *output, void (*error)(char *x));





void

decompress_kernel(unsigned long output_start, unsigned long free_mem_ptr_p,

		unsigned long free_mem_ptr_end_p,

arch/arm/boot/compressed/misc.h

+11 −0
Original line number Diff line number Diff line
@@ -6,5 +6,16 @@ 
void error(char *x) __noreturn;

extern unsigned long free_mem_ptr;

extern unsigned long free_mem_end_ptr;

void __div0(void);

void

decompress_kernel(unsigned long output_start, unsigned long free_mem_ptr_p,

		  unsigned long free_mem_ptr_end_p, int arch_id);

void fortify_panic(const char *name);

int atags_to_fdt(void *atag_list, void *fdt, int total_space);

uint32_t fdt_check_mem_start(uint32_t mem_start, const void *fdt);

int do_decompress(u8 *input, int len, u8 *output, void (*error)(char *x));



extern char input_data[];

extern char input_data_end[];



#endif

arch/arm/include/asm/ftrace.h

+4 −0
Original line number Diff line number Diff line
@@ -75,6 +75,10 @@ static inline bool arch_syscall_match_sym_name(const char *sym, 
	return !strcasecmp(sym, name);

}



void prepare_ftrace_return(unsigned long *parent, unsigned long self,

			   unsigned long frame_pointer,

			   unsigned long stack_pointer);



#endif /* ifndef __ASSEMBLY__ */



#endif /* _ASM_ARM_FTRACE */