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

Commit 67ec11cf authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by Linus Torvalds
Browse files

iommu sg: kill __clear_bit_string and find_next_zero_string 



This kills unused __clear_bit_string and find_next_zero_string (they
were used by only gart and calgary IOMMUs).

Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Cc: Jens Axboe <jens.axboe@oracle.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Muli Ben-Yehuda <mulix@mulix.org>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent fde9a109

arch/x86/lib/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ else 


        lib-y += csum-partial_64.o csum-copy_64.o csum-wrappers_64.o

        lib-y += thunk_64.o clear_page_64.o copy_page_64.o

        lib-y += bitstr_64.o bitops_64.o

        lib-y += bitops_64.o

        lib-y += memmove_64.o memset_64.o

        lib-y += copy_user_64.o rwlock_64.o copy_user_nocache_64.o

endif

arch/x86/lib/bitstr_64.c

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
#include <linux/module.h>

#include <linux/bitops.h>



/* Find string of zero bits in a bitmap */ 

unsigned long 

find_next_zero_string(unsigned long *bitmap, long start, long nbits, int len)

{ 

	unsigned long n, end, i; 	



 again:

	n = find_next_zero_bit(bitmap, nbits, start);

	if (n == -1) 

		return -1;

	

	/* could test bitsliced, but it's hardly worth it */

	end = n+len;

	if (end > nbits)

		return -1; 

	for (i = n+1; i < end; i++) { 

		if (test_bit(i, bitmap)) {  

			start = i+1; 

			goto again; 

		} 

	}

	return n;

}



EXPORT_SYMBOL(find_next_zero_string);

include/asm-x86/bitops_64.h

+0 −16
Original line number Diff line number Diff line
@@ -37,12 +37,6 @@ static inline long __scanbit(unsigned long val, unsigned long max) 
  ((off)+(__scanbit(~(((*(unsigned long *)addr)) >> (off)),(size)-(off)))) : \

	find_next_zero_bit(addr,size,off)))



/* 

 * Find string of zero bits in a bitmap. -1 when not found.

 */ 

extern unsigned long 

find_next_zero_string(unsigned long *bitmap, long start, long nbits, int len);



static inline void set_bit_string(unsigned long *bitmap, unsigned long i, 

				  int len) 

{
@@ -53,16 +47,6 @@ static inline void set_bit_string(unsigned long *bitmap, unsigned long i, 
	}

} 



static inline void __clear_bit_string(unsigned long *bitmap, unsigned long i, 

				    int len) 

{ 

	unsigned long end = i + len; 

	while (i < end) {

		__clear_bit(i, bitmap); 

		i++;

	}

} 



/**

 * ffz - find first zero in word.

 * @word: The word to search