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

Commit 062dfa43 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-arm

parents 7c9dfb59 22f975f4

Documentation/arm/00-INDEX

+2 −0
Original line number Diff line number Diff line
@@ -16,5 +16,7 @@ empeg 
	- Empeg documentation

mem_alignment

	- alignment abort handler documentation

memory.txt

	- description of the virtual memory layout

nwfpe

	- NWFPE floating point emulator documentation

arch/arm/kernel/ptrace.c

+9 −0
Original line number Diff line number Diff line
@@ -242,6 +242,15 @@ get_branch_address(struct task_struct *child, unsigned long pc, unsigned long in 
		 */

		long aluop1, aluop2, ccbit;



	        if ((insn & 0x0fffffd0) == 0x012fff10) {

		        /*

			 * bx or blx

			 */

			alt = get_user_reg(child, insn & 15);

			break;

		}





		if ((insn & 0xf000) != 0xf000)

			break;

drivers/char/watchdog/mpcore_wdt.c

+0 −4
Original line number Diff line number Diff line
@@ -180,10 +180,6 @@ static ssize_t mpcore_wdt_write(struct file *file, const char *data, size_t len, 
{

	struct mpcore_wdt *wdt = file->private_data;



	/*  Can't seek (pwrite) on this device  */

	if (ppos != &file->f_pos)

		return -ESPIPE;



	/*

	 *	Refresh the timer.

	 */

include/asm-arm/arch-pxa/irq.h

+0 −5
Original line number Diff line number Diff line
@@ -12,8 +12,3 @@ 


#define fixup_irq(x)	(x)

/*

 * This prototype is required for cascading of multiplexed interrupts.

 * Since it doesn't exist elsewhere, we'll put it here for now.

 */

extern void do_IRQ(int irq, struct pt_regs *regs);

include/asm-arm/io.h

+3 −3
Original line number Diff line number Diff line
@@ -42,9 +42,9 @@ extern void __raw_writesb(void __iomem *addr, const void *data, int bytelen); 
extern void __raw_writesw(void __iomem *addr, const void *data, int wordlen);

extern void __raw_writesl(void __iomem *addr, const void *data, int longlen);



extern void __raw_readsb(void __iomem *addr, void *data, int bytelen);

extern void __raw_readsw(void __iomem *addr, void *data, int wordlen);

extern void __raw_readsl(void __iomem *addr, void *data, int longlen);

extern void __raw_readsb(const void __iomem *addr, void *data, int bytelen);

extern void __raw_readsw(const void __iomem *addr, void *data, int wordlen);

extern void __raw_readsl(const void __iomem *addr, void *data, int longlen);



#define __raw_writeb(v,a)	(__chk_io_ptr(a), *(volatile unsigned char __force  *)(a) = (v))

#define __raw_writew(v,a)	(__chk_io_ptr(a), *(volatile unsigned short __force *)(a) = (v))