Merge branch 'master' into for-linus

2009-08-16 11:50:10 +02:00
parent dcbf77cac6 b2add73dbf
commit 3e2bcad898
167 changed files with 1656 additions and 864 deletions
--- a/arch/ia64/include/asm/bitops.h
+++ b/arch/ia64/include/asm/bitops.h
@@ -286,7 +286,7 @@ __test_and_clear_bit(int nr, volatile void * addr)
 {
 	__u32 *p = (__u32 *) addr + (nr >> 5);
 	__u32 m = 1 << (nr & 31);
-	int oldbitset = *p & m;
+	int oldbitset = (*p & m) != 0;

 	*p &= ~m;
 	return oldbitset;
--- a/arch/ia64/include/asm/pgtable.h
+++ b/arch/ia64/include/asm/pgtable.h
@@ -155,7 +155,6 @@
 #include <linux/bitops.h>
 #include <asm/cacheflush.h>
 #include <asm/mmu_context.h>
-#include <asm/processor.h>

 /*
 * Next come the mappings that determine how mmap() protection bits