diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2008-05-15 15:13:08 -0500 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-06-03 19:52:52 +0200 |
| commit | f979690ee337450b2030aba128f95b7a8d9881c0 (patch) | |
| tree | 8a126fd159fe6f86c622d08436c6fc1d19bd6b9e | |
| parent | 9b124a68346ce9605b6e1fcf79e1021541cdba9e (diff) | |
| download | blackbird-obmc-uboot-f979690ee337450b2030aba128f95b7a8d9881c0.tar.gz blackbird-obmc-uboot-f979690ee337450b2030aba128f95b7a8d9881c0.zip | |
Fix warnings from gcc-4.3.0 build on a ppc host
* The cfi_flash.c memset fix actual allows the board to boot so there is
a bit more going on here than just resolving warnings associated with
uninitialized variables.
* include/asm/bitops.h:302: warning: '__swab32p' is static but used in
inline function 'ext2_find_next_zero_bit' which is not static
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| -rw-r--r-- | drivers/mtd/cfi_flash.c | 2 | ||||
| -rw-r--r-- | include/asm-ppc/bitops.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c index 68ab55f8a5..d84f0fc55e 100644 --- a/drivers/mtd/cfi_flash.c +++ b/drivers/mtd/cfi_flash.c @@ -1720,6 +1720,8 @@ ulong flash_get_size (ulong base, int banknum) int erase_region_count; struct cfi_qry qry; + memset(&qry, 0, sizeof(qry)); + info->ext_addr = 0; info->cfi_version = 0; #ifdef CFG_FLASH_PROTECTION diff --git a/include/asm-ppc/bitops.h b/include/asm-ppc/bitops.h index 3264915d89..4e9c608341 100644 --- a/include/asm-ppc/bitops.h +++ b/include/asm-ppc/bitops.h @@ -287,7 +287,7 @@ extern __inline__ int ext2_test_bit(int nr, __const__ void * addr) #define ext2_find_first_zero_bit(addr, size) \ ext2_find_next_zero_bit((addr), (size), 0) -extern __inline__ unsigned long ext2_find_next_zero_bit(void *addr, +static __inline__ unsigned long ext2_find_next_zero_bit(void *addr, unsigned long size, unsigned long offset) { unsigned int *p = ((unsigned int *) addr) + (offset >> 5); |
