mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 02:39:48 +00:00
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
This commit is contained in:
commit
535e0c1726
2 changed files with 8 additions and 4 deletions
|
@ -10,7 +10,9 @@ EXPORT_SYMBOL(dma_ops);
|
|||
|
||||
static int __init dma_init(void)
|
||||
{
|
||||
dma_debug_init(PREALLOC_DMA_DEBUG_ENTRIES);
|
||||
dma_debug_init(PREALLOC_DMA_DEBUG_ENTRIES);
|
||||
|
||||
return 0;
|
||||
}
|
||||
fs_initcall(dma_init);
|
||||
|
||||
|
|
|
@ -96,20 +96,22 @@ END(ip_fast_csum)
|
|||
GLOBAL_ENTRY(csum_ipv6_magic)
|
||||
ld4 r20=[in0],4
|
||||
ld4 r21=[in1],4
|
||||
dep r15=in3,in2,32,16
|
||||
zxt4 in2=in2
|
||||
;;
|
||||
ld4 r22=[in0],4
|
||||
ld4 r23=[in1],4
|
||||
mux1 r15=r15,@rev
|
||||
dep r15=in3,in2,32,16
|
||||
;;
|
||||
ld4 r24=[in0],4
|
||||
ld4 r25=[in1],4
|
||||
shr.u r15=r15,16
|
||||
mux1 r15=r15,@rev
|
||||
add r16=r20,r21
|
||||
add r17=r22,r23
|
||||
zxt4 in4=in4
|
||||
;;
|
||||
ld4 r26=[in0],4
|
||||
ld4 r27=[in1],4
|
||||
shr.u r15=r15,16
|
||||
add r18=r24,r25
|
||||
add r8=r16,r17
|
||||
;;
|
||||
|
|
Loading…
Reference in a new issue