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 branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] fix csum_ipv6_magic()
[IA64] Fix warning in dma-mapping.c

Linus Torvalds 535e0c17 0edfa2b1

+8 -4
unified split
+3 -1
arch/ia64/kernel/dma-mapping.c
··· 10 10 11 11 static int __init dma_init(void) 12 12 { 13 - dma_debug_init(PREALLOC_DMA_DEBUG_ENTRIES); 13 + dma_debug_init(PREALLOC_DMA_DEBUG_ENTRIES); 14 + 15 + return 0; 14 16 } 15 17 fs_initcall(dma_init); 16 18
+5 -3
arch/ia64/lib/ip_fast_csum.S
··· 96 96 GLOBAL_ENTRY(csum_ipv6_magic) 97 97 ld4 r20=[in0],4 98 98 ld4 r21=[in1],4 99 - dep r15=in3,in2,32,16 99 + zxt4 in2=in2 100 100 ;; 101 101 ld4 r22=[in0],4 102 102 ld4 r23=[in1],4 103 - mux1 r15=r15,@rev 103 + dep r15=in3,in2,32,16 104 104 ;; 105 105 ld4 r24=[in0],4 106 106 ld4 r25=[in1],4 107 - shr.u r15=r15,16 107 + mux1 r15=r15,@rev 108 108 add r16=r20,r21 109 109 add r17=r22,r23 110 + zxt4 in4=in4 110 111 ;; 111 112 ld4 r26=[in0],4 112 113 ld4 r27=[in1],4 114 + shr.u r15=r15,16 113 115 add r18=r24,r25 114 116 add r8=r16,r17 115 117 ;;