Skip to content

Commit

Permalink
[MIPS] Fix compiler warnings (field width, unused variable)
Browse files Browse the repository at this point in the history
    
Fix following warnings:
linux/arch/mips/kernel/setup.c:432: warning: field width is not type int (arg 2)
linux/arch/mips/kernel/setup.c:432: warning: field width is not type int (arg 4)
linux/arch/mips/kernel/syscall.c:279: warning: unused variable `len'
linux/arch/mips/kernel/syscall.c:280: warning: unused variable `name'
linux/arch/mips/math-emu/dp_fint.c:32: warning: unused variable `xc'
linux/arch/mips/math-emu/dp_flong.c:32: warning: unused variable `xc'
linux/arch/mips/math-emu/sp_fint.c:32: warning: unused variable `xc'
linux/arch/mips/math-emu/sp_flong.c:32: warning: unused variable `xc'
    
(original patch by Atsushi, slight changes to the setup.c part by me.)
    
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  • Loading branch information
atsushi-nemoto authored and ralfbaechle committed Jun 5, 2006
1 parent 460c042 commit ecf52d3
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 11 deletions.
13 changes: 8 additions & 5 deletions arch/mips/kernel/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -419,17 +419,20 @@ static inline void bootmem_init(void)
#ifdef CONFIG_BLK_DEV_INITRD
initrd_below_start_ok = 1;
if (initrd_start) {
unsigned long initrd_size = ((unsigned char *)initrd_end) - ((unsigned char *)initrd_start);
unsigned long initrd_size = ((unsigned char *)initrd_end) -
((unsigned char *)initrd_start);
const int width = sizeof(long) * 2;

printk("Initial ramdisk at: 0x%p (%lu bytes)\n",
(void *)initrd_start, initrd_size);

if (CPHYSADDR(initrd_end) > PFN_PHYS(max_low_pfn)) {
printk("initrd extends beyond end of memory "
"(0x%0*Lx > 0x%0*Lx)\ndisabling initrd\n",
sizeof(long) * 2,
(unsigned long long)CPHYSADDR(initrd_end),
sizeof(long) * 2,
(unsigned long long)PFN_PHYS(max_low_pfn));
width,
(unsigned long long) CPHYSADDR(initrd_end),
width,
(unsigned long long) PFN_PHYS(max_low_pfn));
initrd_start = initrd_end = 0;
initrd_reserve_bootmem = 0;
}
Expand Down
3 changes: 1 addition & 2 deletions arch/mips/kernel/syscall.c
Original file line number Diff line number Diff line change
Expand Up @@ -276,8 +276,7 @@ void sys_set_thread_area(unsigned long addr)

asmlinkage int _sys_sysmips(int cmd, long arg1, int arg2, int arg3)
{
int tmp, len;
char __user *name;
int tmp;

switch(cmd) {
case MIPS_ATOMIC_SET:
Expand Down
4 changes: 3 additions & 1 deletion arch/mips/math-emu/dp_fint.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@

ieee754dp ieee754dp_fint(int x)
{
COMPXDP;
u64 xm;
int xe;
int xs;

CLEARCX;

Expand Down
4 changes: 3 additions & 1 deletion arch/mips/math-emu/dp_flong.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@

ieee754dp ieee754dp_flong(s64 x)
{
COMPXDP;
u64 xm;
int xe;
int xs;

CLEARCX;

Expand Down
4 changes: 3 additions & 1 deletion arch/mips/math-emu/sp_fint.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@

ieee754sp ieee754sp_fint(int x)
{
COMPXSP;
unsigned xm;
int xe;
int xs;

CLEARCX;

Expand Down
4 changes: 3 additions & 1 deletion arch/mips/math-emu/sp_flong.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@

ieee754sp ieee754sp_flong(s64 x)
{
COMPXDP; /* <--- need 64-bit mantissa temp */
u64 xm; /* <--- need 64-bit mantissa temp */
int xe;
int xs;

CLEARCX;

Expand Down

0 comments on commit ecf52d3

Please sign in to comment.