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

Commit a800faec authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://www.jni.nu/cris 

* 'for-linus' of git://www.jni.nu/cris:
  CRISv10: remove redundant tests on unsigned
  CRISv32: irq.c - Move end brace outside #endif
  CRISv32: Fix potential null reference in cryptocop driver.
  CRISv32: Add arch optimized strcmp.
  CRIS: assignment/is equal confusion
parents c488eef8 7b994836

arch/cris/arch-v10/kernel/dma.c

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ int cris_request_dma(unsigned int dmanr, const char * device_id, 
	unsigned long int gens;

	int fail = -EINVAL;



	if ((dmanr < 0) || (dmanr >= MAX_DMA_CHANNELS)) {

	if (dmanr >= MAX_DMA_CHANNELS) {

		printk(KERN_CRIT "cris_request_dma: invalid DMA channel %u\n", dmanr);

		return -EINVAL;

	}
@@ -213,7 +213,7 @@ int cris_request_dma(unsigned int dmanr, const char * device_id, 
void cris_free_dma(unsigned int dmanr, const char * device_id)

{

	unsigned long flags;

	if ((dmanr < 0) || (dmanr >= MAX_DMA_CHANNELS)) {

	if (dmanr >= MAX_DMA_CHANNELS) {

		printk(KERN_CRIT "cris_free_dma: invalid DMA channel %u\n", dmanr);

		return;

	}

arch/cris/arch-v32/drivers/cryptocop.c

+2 −2
Original line number Diff line number Diff line
@@ -1395,7 +1395,7 @@ static int create_md5_pad(int alloc_flag, unsigned long long hashed_length, char 
	if (padlen < MD5_MIN_PAD_LENGTH) padlen += MD5_BLOCK_LENGTH;



	p = kmalloc(padlen, alloc_flag);

	if (!pad) return -ENOMEM;

	if (!p) return -ENOMEM;



	*p = 0x80;

	memset(p+1, 0, padlen - 1);
@@ -1427,7 +1427,7 @@ static int create_sha1_pad(int alloc_flag, unsigned long long hashed_length, cha 
	if (padlen < SHA1_MIN_PAD_LENGTH) padlen += SHA1_BLOCK_LENGTH;



	p = kmalloc(padlen, alloc_flag);

	if (!pad) return -ENOMEM;

	if (!p) return -ENOMEM;



	*p = 0x80;

	memset(p+1, 0, padlen - 1);

arch/cris/arch-v32/kernel/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -430,8 +430,8 @@ crisv32_do_multiple(struct pt_regs* regs) 
			 masked[i] &= ~TIMER_MASK;

			 do_IRQ(TIMER0_INTR_VECT, regs);

		}

	}

#endif

	}



#ifdef IGNORE_MASK

	/* Remove IRQs that can't be handled as multiple. */

arch/cris/arch-v32/lib/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,5 +3,5 @@ 
#



lib-y  = checksum.o checksumcopy.o string.o usercopy.o memset.o \

	csumcpfruser.o spinlock.o delay.o

	csumcpfruser.o spinlock.o delay.o strcmp.o

arch/cris/arch-v32/lib/strcmp.S

0 → 100644
+21 −0
Original line number Diff line number Diff line 
; strcmp.S -- CRISv32 version.

; Copyright (C) 2008 AXIS Communications AB

; Written by Edgar E. Iglesias

;

; This source code is licensed under the GNU General Public License,

; Version 2.  See the file COPYING for more details.



	.global	strcmp

	.type	strcmp,@function

strcmp:

1:

	move.b	[$r10+], $r12

	seq	$r13

	sub.b	[$r11+], $r12

	or.b	$r12, $r13

	beq	1b

	nop



	ret

	movs.b	$r12, $r10

	.size	strcmp, . - strcmp