Commit c9cacf7d 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:

 - fix some kernel-doc warnings

 - fix stack depot IRQ stack filter

 - cast memset() byte to unsigned char

 - explicitly include correct DI includes

 - fix ARCH_LOW_ADDRESS_LIMIT with CONFIG_ZONE_DMA

 - fix get_user() problems when linker uses a veneer

 - make including linux/uaccess.h self-contained on ARM

* tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: 9326/1: make <linux/uaccess.h> self-contained for ARM
  ARM: 9324/1: fix get_user() broken with veneer
  ARM: 9323/1: mm: Fix ARCH_LOW_ADDRESS_LIMIT when CONFIG_ZONE_DMA
  ARM: 9322/1: Explicitly include correct DT includes
  ARM: 9321/1: memset: cast the constant byte to unsigned char
  ARM: 9320/1: fix stack depot IRQ stack filter
  ARM: 9319/1: sa1111: fix sa1111_probe kernel-doc warnings
parents 8c04bddc c7368ddb

arch/arm/common/sa1111.c

+14 −13
Original line number Diff line number Diff line
@@ -785,19 +785,6 @@ sa1111_init_one_child(struct sa1111 *sachip, struct resource *parent, 
	return ret;

}



/**

 *	sa1111_probe - probe for a single SA1111 chip.

 *	@phys_addr: physical address of device.

 *

 *	Probe for a SA1111 chip.  This must be called

 *	before any other SA1111-specific code.

 *

 *	Returns:

 *	%-ENODEV	device not found.

 *	%-EBUSY		physical address already marked in-use.

 *	%-EINVAL	no platform data passed

 *	%0		successful.

 */

static int __sa1111_probe(struct device *me, struct resource *mem, int irq)

{

	struct sa1111_platform_data *pd = me->platform_data;
@@ -1108,6 +1095,20 @@ static int sa1111_resume_noirq(struct device *dev) 
#define sa1111_resume_noirq  NULL

#endif



/**

 *	sa1111_probe - probe for a single SA1111 chip.

 *	@pdev: platform device.

 *

 *	Probe for a SA1111 chip.  This must be called

 *	before any other SA1111-specific code.

 *

 *	Returns:

 *	* %-ENODEV	- device not found.

 *	* %-ENOMEM	- memory allocation failure.

 *	* %-EBUSY	- physical address already marked in-use.

 *	* %-EINVAL	- no platform data passed

 *	* %0		- successful.

 */

static int sa1111_probe(struct platform_device *pdev)

{

	struct resource *mem;

arch/arm/include/asm/dma.h

+3 −0
Original line number Diff line number Diff line
@@ -12,6 +12,9 @@ 
	extern phys_addr_t arm_dma_zone_size; \

	arm_dma_zone_size && arm_dma_zone_size < (0x100000000ULL - PAGE_OFFSET) ? \

		(PAGE_OFFSET + arm_dma_zone_size) : 0xffffffffUL; })



extern phys_addr_t arm_dma_limit;

#define ARCH_LOW_ADDRESS_LIMIT arm_dma_limit

#endif



#ifdef CONFIG_ISA_DMA_API

arch/arm/include/asm/domain.h

+1 −1
Original line number Diff line number Diff line
@@ -8,8 +8,8 @@ 
#define __ASM_PROC_DOMAIN_H



#ifndef __ASSEMBLY__

#include <linux/thread_info.h>

#include <asm/barrier.h>

#include <asm/thread_info.h>

#endif



/*

arch/arm/include/asm/exception.h

+0 −4
Original line number Diff line number Diff line
@@ -10,10 +10,6 @@ 


#include <linux/interrupt.h>



#ifdef CONFIG_FUNCTION_GRAPH_TRACER

#define __exception_irq_entry	__irq_entry

#else

#define __exception_irq_entry

#endif



#endif /* __ASM_ARM_EXCEPTION_H */

arch/arm/include/asm/traps.h

+2 −1
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#ifndef _ASMARM_TRAP_H

#define _ASMARM_TRAP_H



#include <linux/linkage.h>

#include <linux/list.h>



struct pt_regs;
@@ -28,7 +29,7 @@ static inline int __in_irqentry_text(unsigned long ptr) 
	       ptr < (unsigned long)&__irqentry_text_end;

}



extern void __init early_trap_init(void *);

extern void early_trap_init(void *);

extern void dump_backtrace_entry(unsigned long where, unsigned long from,

				 unsigned long frame, const char *loglvl);

extern void ptrace_break(struct pt_regs *regs);