Commit e540dbf8 authored by Martin Schwidefsky's avatar Martin Schwidefsky Committed by Linus Torvalds

[PATCH] s390: warnings.

Remove some warnings.
parent 49bdf267
...@@ -274,7 +274,7 @@ void machine_power_off_smp(void) ...@@ -274,7 +274,7 @@ void machine_power_off_smp(void)
void do_ext_call_interrupt(struct pt_regs *regs, __u16 code) void do_ext_call_interrupt(struct pt_regs *regs, __u16 code)
{ {
int bits; unsigned long bits;
/* /*
* handle bit signal external calls * handle bit signal external calls
...@@ -282,9 +282,7 @@ void do_ext_call_interrupt(struct pt_regs *regs, __u16 code) ...@@ -282,9 +282,7 @@ void do_ext_call_interrupt(struct pt_regs *regs, __u16 code)
* For the ec_schedule signal we have to do nothing. All the work * For the ec_schedule signal we have to do nothing. All the work
* is done automatically when we return from the interrupt. * is done automatically when we return from the interrupt.
*/ */
do { bits = xchg(&S390_lowcore.ext_call_fast, 0);
bits = atomic_read(&S390_lowcore.ext_call_fast);
} while (atomic_compare_and_swap(bits,0,&S390_lowcore.ext_call_fast));
if (test_bit(ec_call_function, &bits)) if (test_bit(ec_call_function, &bits))
do_call_function(); do_call_function();
...@@ -296,13 +294,12 @@ void do_ext_call_interrupt(struct pt_regs *regs, __u16 code) ...@@ -296,13 +294,12 @@ void do_ext_call_interrupt(struct pt_regs *regs, __u16 code)
*/ */
static sigp_ccode smp_ext_bitcall(int cpu, ec_bit_sig sig) static sigp_ccode smp_ext_bitcall(int cpu, ec_bit_sig sig)
{ {
struct _lowcore *lowcore = lowcore_ptr[cpu];
sigp_ccode ccode; sigp_ccode ccode;
/* /*
* Set signaling bit in lowcore of target cpu and kick it * Set signaling bit in lowcore of target cpu and kick it
*/ */
atomic_set_mask(1<<sig, &lowcore->ext_call_fast); set_bit(sig, (unsigned long *) &lowcore_ptr[cpu]->ext_call_fast);
ccode = signal_processor(cpu, sigp_external_call); ccode = signal_processor(cpu, sigp_external_call);
return ccode; return ccode;
} }
...@@ -323,7 +320,7 @@ static void smp_ext_bitcall_others(ec_bit_sig sig) ...@@ -323,7 +320,7 @@ static void smp_ext_bitcall_others(ec_bit_sig sig)
/* /*
* Set signaling bit in lowcore of target cpu and kick it * Set signaling bit in lowcore of target cpu and kick it
*/ */
atomic_set_mask(1<<sig, &lowcore->ext_call_fast); set_bit(sig, (unsigned long *) &lowcore_ptr[i]->ext_call_fast);
while (signal_processor(i, sigp_external_call) == sigp_busy) while (signal_processor(i, sigp_external_call) == sigp_busy)
udelay(10); udelay(10);
} }
......
...@@ -140,7 +140,6 @@ static inline __u32 div64_32(__u64 dividend, __u32 divisor) ...@@ -140,7 +140,6 @@ static inline __u32 div64_32(__u64 dividend, __u32 divisor)
*/ */
static void do_comparator_interrupt(struct pt_regs *regs, __u16 error_code) static void do_comparator_interrupt(struct pt_regs *regs, __u16 error_code)
{ {
int cpu = smp_processor_id();
__u64 tmp; __u64 tmp;
__u32 ticks; __u32 ticks;
......
...@@ -188,7 +188,7 @@ void free_initmem(void) ...@@ -188,7 +188,7 @@ void free_initmem(void)
free_page(addr); free_page(addr);
totalram_pages++; totalram_pages++;
} }
printk ("Freeing unused kernel memory: %dk freed\n", printk ("Freeing unused kernel memory: %ldk freed\n",
((unsigned long)&__init_end - (unsigned long)&__init_begin) >> 10); ((unsigned long)&__init_end - (unsigned long)&__init_begin) >> 10);
} }
......
...@@ -126,7 +126,6 @@ void do_settimeofday(struct timeval *tv) ...@@ -126,7 +126,6 @@ void do_settimeofday(struct timeval *tv)
*/ */
static void do_comparator_interrupt(struct pt_regs *regs, __u16 error_code) static void do_comparator_interrupt(struct pt_regs *regs, __u16 error_code)
{ {
int cpu = smp_processor_id();
__u64 tmp; __u64 tmp;
__u32 ticks; __u32 ticks;
......
...@@ -136,7 +136,7 @@ struct _lowcore ...@@ -136,7 +136,7 @@ struct _lowcore
/* SMP info area: defined by DJB */ /* SMP info area: defined by DJB */
__u64 jiffy_timer; /* 0xc80 */ __u64 jiffy_timer; /* 0xc80 */
atomic_t ext_call_fast; /* 0xc88 */ __u32 ext_call_fast; /* 0xc88 */
__u8 pad11[0xe00-0xc8c]; /* 0xc8c */ __u8 pad11[0xe00-0xc8c]; /* 0xc8c */
/* 0xe00 is used as indicator for dump tools */ /* 0xe00 is used as indicator for dump tools */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment