Skip to content

Commit 2b603cd

Browse files
torvaldstorvalds
committed
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()
2 parents f810c18 + 85e18ed commit 2b603cd

55 files changed

Lines changed: 185 additions & 80 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎arch/arm/boot/compressed/atags_to_fdt.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#include <linux/libfdt_env.h>
33
#include <asm/setup.h>
44
#include <libfdt.h>
5+
#include "misc.h"
56

67
#if defined(CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND)
78
#define do_extend_cmdline 1

‎arch/arm/boot/compressed/fdt_check_mem_start.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#include <linux/kernel.h>
44
#include <linux/libfdt.h>
55
#include <linux/sizes.h>
6+
#include "misc.h"
67

78
static const void *get_prop(const void *fdt, const char *node_path,
89
const char *property, int minlen)

‎arch/arm/boot/compressed/misc.c‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,6 @@ static void putstr(const char *ptr)
103103
/*
104104
* gzip declarations
105105
*/
106-
extern char input_data[];
107-
extern char input_data_end[];
108-
109106
unsigned char *output_data;
110107

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

134-
extern int do_decompress(u8 *input, int len, u8 *output, void (*error)(char *x));
135-
136-
137131
void
138132
decompress_kernel(unsigned long output_start, unsigned long free_mem_ptr_p,
139133
unsigned long free_mem_ptr_end_p,

‎arch/arm/boot/compressed/misc.h‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,16 @@
66
void error(char *x) __noreturn;
77
extern unsigned long free_mem_ptr;
88
extern unsigned long free_mem_end_ptr;
9+
void __div0(void);
10+
void
11+
decompress_kernel(unsigned long output_start, unsigned long free_mem_ptr_p,
12+
unsigned long free_mem_ptr_end_p, int arch_id);
13+
void fortify_panic(const char *name);
14+
int atags_to_fdt(void *atag_list, void *fdt, int total_space);
15+
uint32_t fdt_check_mem_start(uint32_t mem_start, const void *fdt);
16+
int do_decompress(u8 *input, int len, u8 *output, void (*error)(char *x));
17+
18+
extern char input_data[];
19+
extern char input_data_end[];
920

1021
#endif

‎arch/arm/include/asm/ftrace.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,10 @@ static inline bool arch_syscall_match_sym_name(const char *sym,
7575
return !strcasecmp(sym, name);
7676
}
7777

78+
void prepare_ftrace_return(unsigned long *parent, unsigned long self,
79+
unsigned long frame_pointer,
80+
unsigned long stack_pointer);
81+
7882
#endif /* ifndef __ASSEMBLY__ */
7983

8084
#endif /* _ASM_ARM_FTRACE */

‎arch/arm/include/asm/mach/arch.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ struct machine_desc {
5656
void (*init_time)(void);
5757
void (*init_machine)(void);
5858
void (*init_late)(void);
59-
void (*handle_irq)(struct pt_regs *);
6059
void (*restart)(enum reboot_mode, const char *);
6160
};
6261

‎arch/arm/include/asm/page.h‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,28 @@ struct cpu_user_fns {
113113
unsigned long vaddr, struct vm_area_struct *vma);
114114
};
115115

116+
void fa_copy_user_highpage(struct page *to, struct page *from,
117+
unsigned long vaddr, struct vm_area_struct *vma);
118+
void fa_clear_user_highpage(struct page *page, unsigned long vaddr);
119+
void feroceon_copy_user_highpage(struct page *to, struct page *from,
120+
unsigned long vaddr, struct vm_area_struct *vma);
121+
void feroceon_clear_user_highpage(struct page *page, unsigned long vaddr);
122+
void v4_mc_copy_user_highpage(struct page *to, struct page *from,
123+
unsigned long vaddr, struct vm_area_struct *vma);
124+
void v4_mc_clear_user_highpage(struct page *page, unsigned long vaddr);
125+
void v4wb_copy_user_highpage(struct page *to, struct page *from,
126+
unsigned long vaddr, struct vm_area_struct *vma);
127+
void v4wb_clear_user_highpage(struct page *page, unsigned long vaddr);
128+
void v4wt_copy_user_highpage(struct page *to, struct page *from,
129+
unsigned long vaddr, struct vm_area_struct *vma);
130+
void v4wt_clear_user_highpage(struct page *page, unsigned long vaddr);
131+
void xsc3_mc_copy_user_highpage(struct page *to, struct page *from,
132+
unsigned long vaddr, struct vm_area_struct *vma);
133+
void xsc3_mc_clear_user_highpage(struct page *page, unsigned long vaddr);
134+
void xscale_mc_copy_user_highpage(struct page *to, struct page *from,
135+
unsigned long vaddr, struct vm_area_struct *vma);
136+
void xscale_mc_clear_user_highpage(struct page *page, unsigned long vaddr);
137+
116138
#ifdef MULTI_USER
117139
extern struct cpu_user_fns cpu_user;
118140

‎arch/arm/include/asm/ptrace.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,5 +193,8 @@ static inline unsigned long it_advance(unsigned long cpsr)
193193
return cpsr;
194194
}
195195

196+
int syscall_trace_enter(struct pt_regs *regs);
197+
void syscall_trace_exit(struct pt_regs *regs);
198+
196199
#endif /* __ASSEMBLY__ */
197200
#endif

‎arch/arm/include/asm/setup.h‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,11 @@ extern void save_atags(const struct tag *tags);
2828
static inline void save_atags(const struct tag *tags) { }
2929
#endif
3030

31+
struct machine_desc;
32+
void init_default_cache_policy(unsigned long);
33+
void paging_init(const struct machine_desc *desc);
34+
void early_mm_init(const struct machine_desc *);
35+
void adjust_lowmem_bounds(void);
36+
void setup_dma_zone(const struct machine_desc *desc);
37+
3138
#endif

‎arch/arm/include/asm/signal.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,9 @@ typedef struct {
2222
#define __ARCH_HAS_SA_RESTORER
2323

2424
#include <asm/sigcontext.h>
25+
26+
void do_rseq_syscall(struct pt_regs *regs);
27+
int do_work_pending(struct pt_regs *regs, unsigned int thread_flags,
28+
int syscall);
29+
2530
#endif

0 commit comments

Comments
 (0)