Commit 6d925f6d authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds

[PATCH] x86_64: Fix some gcc 4 warnings in arch/x86_64

Fix some gcc 4 warnings in arch/x86_64

There are tons more outside though.
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a46596de
...@@ -61,16 +61,17 @@ static void __init copy_bootdata(char *real_mode_data) ...@@ -61,16 +61,17 @@ static void __init copy_bootdata(char *real_mode_data)
static void __init setup_boot_cpu_data(void) static void __init setup_boot_cpu_data(void)
{ {
int dummy, eax; unsigned int dummy, eax;
/* get vendor info */ /* get vendor info */
cpuid(0, &boot_cpu_data.cpuid_level, cpuid(0, (unsigned int *)&boot_cpu_data.cpuid_level,
(int *)&boot_cpu_data.x86_vendor_id[0], (unsigned int *)&boot_cpu_data.x86_vendor_id[0],
(int *)&boot_cpu_data.x86_vendor_id[8], (unsigned int *)&boot_cpu_data.x86_vendor_id[8],
(int *)&boot_cpu_data.x86_vendor_id[4]); (unsigned int *)&boot_cpu_data.x86_vendor_id[4]);
/* get cpu type */ /* get cpu type */
cpuid(1, &eax, &dummy, &dummy, (int *) &boot_cpu_data.x86_capability); cpuid(1, &eax, &dummy, &dummy,
(unsigned int *) &boot_cpu_data.x86_capability);
boot_cpu_data.x86 = (eax >> 8) & 0xf; boot_cpu_data.x86 = (eax >> 8) & 0xf;
boot_cpu_data.x86_model = (eax >> 4) & 0xf; boot_cpu_data.x86_model = (eax >> 4) & 0xf;
boot_cpu_data.x86_mask = eax & 0xf; boot_cpu_data.x86_mask = eax & 0xf;
......
...@@ -849,10 +849,10 @@ void __init early_identify_cpu(struct cpuinfo_x86 *c) ...@@ -849,10 +849,10 @@ void __init early_identify_cpu(struct cpuinfo_x86 *c)
memset(&c->x86_capability, 0, sizeof c->x86_capability); memset(&c->x86_capability, 0, sizeof c->x86_capability);
/* Get vendor name */ /* Get vendor name */
cpuid(0x00000000, &c->cpuid_level, cpuid(0x00000000, (unsigned int *)&c->cpuid_level,
(int *)&c->x86_vendor_id[0], (unsigned int *)&c->x86_vendor_id[0],
(int *)&c->x86_vendor_id[8], (unsigned int *)&c->x86_vendor_id[8],
(int *)&c->x86_vendor_id[4]); (unsigned int *)&c->x86_vendor_id[4]);
get_cpu_vendor(c); get_cpu_vendor(c);
......
...@@ -139,7 +139,7 @@ asmlinkage long sys_rt_sigreturn(struct pt_regs *regs) ...@@ -139,7 +139,7 @@ asmlinkage long sys_rt_sigreturn(struct pt_regs *regs)
{ {
struct rt_sigframe __user *frame; struct rt_sigframe __user *frame;
sigset_t set; sigset_t set;
long eax; unsigned long eax;
frame = (struct rt_sigframe __user *)(regs->rsp - 8); frame = (struct rt_sigframe __user *)(regs->rsp - 8);
if (verify_area(VERIFY_READ, frame, sizeof(*frame))) { if (verify_area(VERIFY_READ, frame, sizeof(*frame))) {
......
...@@ -67,7 +67,8 @@ ...@@ -67,7 +67,8 @@
: "=a" (low), "=d" (high) \ : "=a" (low), "=d" (high) \
: "c" (counter)) : "c" (counter))
extern inline void cpuid(int op, int *eax, int *ebx, int *ecx, int *edx) extern inline void cpuid(int op, unsigned int *eax, unsigned int *ebx,
unsigned int *ecx, unsigned int *edx)
{ {
__asm__("cpuid" __asm__("cpuid"
: "=a" (*eax), : "=a" (*eax),
......
...@@ -724,7 +724,7 @@ static inline long dup(unsigned int fd) ...@@ -724,7 +724,7 @@ static inline long dup(unsigned int fd)
} }
/* implemented in asm in arch/x86_64/kernel/entry.S */ /* implemented in asm in arch/x86_64/kernel/entry.S */
extern long execve(char *, char **, char **); extern int execve(const char *, char * const *, char * const *);
static inline long open(const char * filename, int flags, int mode) static inline long open(const char * filename, int flags, int mode)
{ {
......
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