diff options
| author | Andi Kleen <ak@suse.de> | 2005-01-11 01:47:35 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-01-11 01:47:35 -0800 |
| commit | 6d925f6d2b0c955ee1185f9923b5aa2f02a3d7fd (patch) | |
| tree | fe1d2c147d623b0481af0410719fd7cfd87d7834 /include | |
| parent | a46596def4cc4beb3f850dee0f2643fa3cc88ce0 (diff) | |
| download | history-6d925f6d2b0c955ee1185f9923b5aa2f02a3d7fd.tar.gz | |
[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: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-x86_64/msr.h | 3 | ||||
| -rw-r--r-- | include/asm-x86_64/unistd.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/asm-x86_64/msr.h b/include/asm-x86_64/msr.h index ed94245a5d4f65..8506956784197f 100644 --- a/include/asm-x86_64/msr.h +++ b/include/asm-x86_64/msr.h @@ -67,7 +67,8 @@ : "=a" (low), "=d" (high) \ : "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" : "=a" (*eax), diff --git a/include/asm-x86_64/unistd.h b/include/asm-x86_64/unistd.h index 506ec8d12e7572..f1a510a9b195b1 100644 --- a/include/asm-x86_64/unistd.h +++ b/include/asm-x86_64/unistd.h @@ -724,7 +724,7 @@ static inline long dup(unsigned int fd) } /* 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) { |