Commit fb64a24a authored by Anton Blanchard's avatar Anton Blanchard

ppc64: fix compile warnings

parent 2d68a588
...@@ -11,10 +11,11 @@ ...@@ -11,10 +11,11 @@
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/signal.h> #include <linux/signal.h>
#include <linux/cache.h> #include <linux/cache.h>
#include <asm/io.h>
#include "i8259.h"
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/interrupt.h>
#include <asm/io.h>
#include <asm/ppcdebug.h> #include <asm/ppcdebug.h>
#include "i8259.h"
unsigned char cached_8259[2] = { 0xff, 0xff }; unsigned char cached_8259[2] = { 0xff, 0xff };
#define cached_A1 (cached_8259[0]) #define cached_A1 (cached_8259[0])
......
...@@ -4496,7 +4496,7 @@ int register_ioctl32_conversion(unsigned int cmd, int (*handler)(unsigned int, u ...@@ -4496,7 +4496,7 @@ int register_ioctl32_conversion(unsigned int cmd, int (*handler)(unsigned int, u
{ {
int i; int i;
if (!additional_ioctls) { if (!additional_ioctls) {
additional_ioctls = get_zeroed_page(GFP_KERNEL); additional_ioctls = (struct ioctl_trans *)get_zeroed_page(GFP_KERNEL);
if (!additional_ioctls) if (!additional_ioctls)
return -ENOMEM; return -ENOMEM;
} }
......
...@@ -750,6 +750,8 @@ long sys32_rt_sigqueueinfo(u32 pid, u32 sig, siginfo_t32 *uinfo) ...@@ -750,6 +750,8 @@ long sys32_rt_sigqueueinfo(u32 pid, u32 sig, siginfo_t32 *uinfo)
return ret; return ret;
} }
extern int do_signal(sigset_t *oldset, struct pt_regs *regs);
int sys32_rt_sigsuspend(compat_sigset_t* unewset, size_t sigsetsize, int p3, int sys32_rt_sigsuspend(compat_sigset_t* unewset, size_t sigsetsize, int p3,
int p4, int p6, int p7, struct pt_regs *regs) int p4, int p6, int p7, struct pt_regs *regs)
{ {
......
...@@ -63,7 +63,6 @@ extern unsigned char stab_array[]; ...@@ -63,7 +63,6 @@ extern unsigned char stab_array[];
extern int cpu_idle(void *unused); extern int cpu_idle(void *unused);
void smp_call_function_interrupt(void); void smp_call_function_interrupt(void);
void smp_message_pass(int target, int msg, unsigned long data, int wait); void smp_message_pass(int target, int msg, unsigned long data, int wait);
static unsigned long iSeries_smp_message[NR_CPUS];
void xics_setup_cpu(void); void xics_setup_cpu(void);
void xics_cause_IPI(int cpu); void xics_cause_IPI(int cpu);
...@@ -87,6 +86,8 @@ static inline void set_tb(unsigned int upper, unsigned int lower) ...@@ -87,6 +86,8 @@ static inline void set_tb(unsigned int upper, unsigned int lower)
} }
#ifdef CONFIG_PPC_ISERIES #ifdef CONFIG_PPC_ISERIES
static unsigned long iSeries_smp_message[NR_CPUS];
void iSeries_smp_message_recv( struct pt_regs * regs ) void iSeries_smp_message_recv( struct pt_regs * regs )
{ {
int cpu = smp_processor_id(); int cpu = smp_processor_id();
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
#include <asm/udbg.h> #include <asm/udbg.h>
extern void xmon_printf(const char *fmt, ...); extern void xmon_printf(const char *fmt, ...);
static int xmon_expect(const char *str, unsigned int timeout);
#define TB_SPEED 25000000 #define TB_SPEED 25000000
...@@ -121,32 +120,6 @@ static char line[256]; ...@@ -121,32 +120,6 @@ static char line[256];
static char *lineptr; static char *lineptr;
static int lineleft; static int lineleft;
int xmon_expect(const char *str, unsigned int timeout)
{
int c;
unsigned int t0;
timeout *= TB_SPEED;
t0 = readtb();
do {
lineptr = line;
for (;;) {
c = xmon_read_poll();
if (c == -1) {
if (readtb() - t0 > timeout)
return 0;
continue;
}
if (c == '\n')
break;
if (c != '\r' && lineptr < &line[sizeof(line) - 1])
*lineptr++ = c;
}
*lineptr = 0;
} while (strstr(line, str) == NULL);
return 1;
}
int int
xmon_getchar(void) xmon_getchar(void)
{ {
......
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