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

Commit 535e0c17 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 0edfa2b1 5afe18d2

arch/ia64/kernel/dma-mapping.c

+3 −1
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ EXPORT_SYMBOL(dma_ops); 
static int __init dma_init(void)

{

	dma_debug_init(PREALLOC_DMA_DEBUG_ENTRIES);



	return 0;

}

fs_initcall(dma_init);

arch/ia64/lib/ip_fast_csum.S

+5 −3
Original line number Diff line number Diff line
@@ -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

	;;