浏览代码

microblaze: Correct ffs regression for Microblaze

We are using generic implementation of ffs. This should
be part of Simon's commit 0413cfecea350000eab5e591a0965c3e3ee0ff00

Here is warning message which this patch removes.

In file included from /tmp/u-boot-microblaze/include/common.h:38,
                 from cmd_mtdparts.c:87:
/tmp/u-boot-microblaze/include/linux/bitops.h:123:1: warning: "ffs" redefined
In file included from /tmp/u-boot-microblaze/include/linux/bitops.h:110,
                 from /tmp/u-boot-microblaze/include/common.h:38,
                 from cmd_mtdparts.c:87:
/tmp/u-boot-microblaze/include/asm/bitops.h:269:1:
warning: this is the location of the previous definition

Signed-off-by: Michal Simek <monstr@monstr.eu>
Michal Simek 15 年之前
父节点
当前提交
386118a896
共有 1 个文件被更改,包括 0 次插入2 次删除
  1. 0 2
      include/asm-microblaze/bitops.h

+ 0 - 2
include/asm-microblaze/bitops.h

@@ -266,8 +266,6 @@ found_middle:
 	return result + ffz(tmp);
 	return result + ffz(tmp);
 }
 }
 
 
-#define ffs(x) generic_ffs(x)
-
 /*
 /*
  * hweightN: returns the hamming weight (i.e. the number
  * hweightN: returns the hamming weight (i.e. the number
  * of bits set) of a N-bit word
  * of bits set) of a N-bit word