tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds 062dfa43 7c9dfb59

+15 -12
unified split
+2
Documentation/arm/00-INDEX
··· 16 16 - Empeg documentation 17 17 mem_alignment 18 18 - alignment abort handler documentation 19 + memory.txt 20 + - description of the virtual memory layout 19 21 nwfpe 20 22 - NWFPE floating point emulator documentation
+9
arch/arm/kernel/ptrace.c
··· 242 242 */ 243 243 long aluop1, aluop2, ccbit; 244 244 245 + if ((insn & 0x0fffffd0) == 0x012fff10) { 246 + /* 247 + * bx or blx 248 + */ 249 + alt = get_user_reg(child, insn & 15); 250 + break; 251 + } 252 + 253 + 245 254 if ((insn & 0xf000) != 0xf000) 246 255 break; 247 256
-4
drivers/char/watchdog/mpcore_wdt.c
··· 180 180 { 181 181 struct mpcore_wdt *wdt = file->private_data; 182 182 183 - /* Can't seek (pwrite) on this device */ 184 - if (ppos != &file->f_pos) 185 - return -ESPIPE; 186 - 187 183 /* 188 184 * Refresh the timer. 189 185 */
-5
include/asm-arm/arch-pxa/irq.h
··· 12 12 13 13 #define fixup_irq(x) (x) 14 14 15 - /* 16 - * This prototype is required for cascading of multiplexed interrupts. 17 - * Since it doesn't exist elsewhere, we'll put it here for now. 18 - */ 19 - extern void do_IRQ(int irq, struct pt_regs *regs);
+3 -3
include/asm-arm/io.h
··· 42 42 extern void __raw_writesw(void __iomem *addr, const void *data, int wordlen); 43 43 extern void __raw_writesl(void __iomem *addr, const void *data, int longlen); 44 44 45 - extern void __raw_readsb(void __iomem *addr, void *data, int bytelen); 46 - extern void __raw_readsw(void __iomem *addr, void *data, int wordlen); 47 - extern void __raw_readsl(void __iomem *addr, void *data, int longlen); 45 + extern void __raw_readsb(const void __iomem *addr, void *data, int bytelen); 46 + extern void __raw_readsw(const void __iomem *addr, void *data, int wordlen); 47 + extern void __raw_readsl(const void __iomem *addr, void *data, int longlen); 48 48 49 49 #define __raw_writeb(v,a) (__chk_io_ptr(a), *(volatile unsigned char __force *)(a) = (v)) 50 50 #define __raw_writew(v,a) (__chk_io_ptr(a), *(volatile unsigned short __force *)(a) = (v))
+1
include/asm-arm/memory.h
··· 122 122 */ 123 123 #define __pa(x) __virt_to_phys((unsigned long)(x)) 124 124 #define __va(x) ((void *)__phys_to_virt((unsigned long)(x))) 125 + #define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT) 125 126 126 127 /* 127 128 * Virtual <-> DMA view memory address translations