diff -uprN -X dontdiff linux-2.6.14-rc3/drivers/char/drm/i830_dma.c linux-2.6.14-rc3-patch/drivers/char/drm/i830_dma.c --- linux-2.6.14-rc3/drivers/char/drm/i830_dma.c 2005-10-04 11:19:44.000000000 +0200 +++ linux-2.6.14-rc3-patch/drivers/char/drm/i830_dma.c 2005-10-06 04:43:58.000000000 +0200 @@ -594,21 +594,6 @@ static void i830EmitTexPalette( drm_devi return; - BEGIN_LP_RING( 258 ); - - if(is_shared == 1) { - OUT_RING(CMD_OP_MAP_PALETTE_LOAD | - MAP_PALETTE_NUM(0) | - MAP_PALETTE_BOTH); - } else { - OUT_RING(CMD_OP_MAP_PALETTE_LOAD | MAP_PALETTE_NUM(number)); - } - for(i = 0; i < 256; i++) { - OUT_RING(palette[i]); - } - OUT_RING(0); - /* KW: WHERE IS THE ADVANCE_LP_RING? This is effectively a noop! - */ } /* Need to do some additional checking when setting the dest buffer. diff -uprN -X dontdiff linux-2.6.14-rc3/fs/udf/super.c linux-2.6.14-rc3-patch/fs/udf/super.c --- linux-2.6.14-rc3/fs/udf/super.c 2005-08-29 01:41:01.000000000 +0200 +++ linux-2.6.14-rc3-patch/fs/udf/super.c 2005-10-06 04:45:13.000000000 +0200 @@ -793,55 +793,6 @@ udf_find_fileset(struct super_block *sb, kernel_lb_addr newfileset; return 1; - - for (newfileset.partitionReferenceNum=UDF_SB_NUMPARTS(sb)-1; - (newfileset.partitionReferenceNum != 0xFFFF && - fileset->logicalBlockNum == 0xFFFFFFFF && - fileset->partitionReferenceNum == 0xFFFF); - newfileset.partitionReferenceNum--) - { - lastblock = UDF_SB_PARTLEN(sb, newfileset.partitionReferenceNum); - newfileset.logicalBlockNum = 0; - - do - { - bh = udf_read_ptagged(sb, newfileset, 0, &ident); - if (!bh) - { - newfileset.logicalBlockNum ++; - continue; - } - - switch (ident) - { - case TAG_IDENT_SBD: - { - struct spaceBitmapDesc *sp; - sp = (struct spaceBitmapDesc *)bh->b_data; - newfileset.logicalBlockNum += 1 + - ((le32_to_cpu(sp->numOfBytes) + sizeof(struct spaceBitmapDesc) - 1) - >> sb->s_blocksize_bits); - udf_release_data(bh); - break; - } - case TAG_IDENT_FSD: - { - *fileset = newfileset; - break; - } - default: - { - newfileset.logicalBlockNum ++; - udf_release_data(bh); - bh = NULL; - break; - } - } - } - while (newfileset.logicalBlockNum < lastblock && - fileset->logicalBlockNum == 0xFFFFFFFF && - fileset->partitionReferenceNum == 0xFFFF); - } } if ((fileset->logicalBlockNum != 0xFFFFFFFF || diff -uprN -X dontdiff linux-2.6.14-rc3/net/rxrpc/transport.c linux-2.6.14-rc3-patch/net/rxrpc/transport.c --- linux-2.6.14-rc3/net/rxrpc/transport.c 2005-10-04 11:20:21.000000000 +0200 +++ linux-2.6.14-rc3-patch/net/rxrpc/transport.c 2005-10-06 04:45:59.000000000 +0200 @@ -563,8 +563,6 @@ void rxrpc_trans_receive_packet(struct r kfree_skb(pkt); } - _leave(""); - } /* end rxrpc_trans_receive_packet() */ /*****************************************************************************/ @@ -848,7 +846,4 @@ static void rxrpc_trans_receive_error_re rxrpc_put_peer(peer); } } - - _leave(""); - return; } /* end rxrpc_trans_receive_error_report() */