Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20a2a811 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm 

Pull ARM fixes from Russell King:
 "Nothing too big here, just small fixes."

* 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
  ARM: fix more fallout from 9f97da78 (Disintegrate asm/system.h for ARM)
  ARM: fix bios32.c build warning
  ARM: 7337/1: ptrace: fix ptrace_read_user for !CONFIG_MMU platforms
  ARM: fix missing bug.h include in arch/arm/kernel/insn.c
  ARM: sa11x0: fix build errors from DMA engine API updates
parents a92bc5a6 6d008893

arch/arm/kernel/bios32.c

+0 −1
Original line number Diff line number Diff line
@@ -299,7 +299,6 @@ static inline int pdev_bad_for_parity(struct pci_dev *dev) 
 */

void pcibios_fixup_bus(struct pci_bus *bus)

{

	struct pci_sys_data *root = bus->sysdata;

	struct pci_dev *dev;

	u16 features = PCI_COMMAND_SERR | PCI_COMMAND_PARITY | PCI_COMMAND_FAST_BACK;

arch/arm/kernel/insn.c

+1 −0
Original line number Diff line number Diff line 
#include <linux/bug.h>

#include <linux/kernel.h>

#include <asm/opcodes.h>

arch/arm/kernel/ptrace.c

+3 −1
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ static int ptrace_read_user(struct task_struct *tsk, unsigned long off, 
{

	unsigned long tmp;



	if (off & 3 || off >= sizeof(struct user))

	if (off & 3)

		return -EIO;



	tmp = 0;
@@ -268,6 +268,8 @@ static int ptrace_read_user(struct task_struct *tsk, unsigned long off, 
		tmp = tsk->mm->end_code;

	else if (off < sizeof(struct pt_regs))

		tmp = get_user_reg(tsk, off >> 2);

	else if (off >= sizeof(struct user))

		return -EIO;



	return put_user(tmp, ret);

}

arch/arm/mach-omap2/include/mach/barriers.h

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 
#ifndef __MACH_BARRIERS_H

#define __MACH_BARRIERS_H



#include <asm/outercache.h>



extern void omap_bus_sync(void);



#define rmb()		dsb()

drivers/dma/sa11x0-dma.c

+1 −1
Original line number Diff line number Diff line
@@ -585,7 +585,7 @@ static dma_cookie_t sa11x0_dma_tx_submit(struct dma_async_tx_descriptor *tx) 


static struct dma_async_tx_descriptor *sa11x0_dma_prep_slave_sg(

	struct dma_chan *chan, struct scatterlist *sg, unsigned int sglen,

	enum dma_transfer_direction dir, unsigned long flags)

	enum dma_transfer_direction dir, unsigned long flags, void *context)

{

	struct sa11x0_dma_chan *c = to_sa11x0_dma_chan(chan);

	struct sa11x0_dma_desc *txd;