diff options
author | Olaf Hering <olh@suse.de> | 2005-07-27 14:45:17 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-27 19:26:08 -0400 |
commit | 44456d37b59d8e541936ed26d8b6e08d27e88ac1 (patch) | |
tree | 11ca6fa29b8cfb56ecef2d1f4f9dc2d9d71d2a2f /arch/um | |
parent | 02b775696fee75a04041d8d94db26a9462216d24 (diff) |
[PATCH] turn many #if $undefined_string into #ifdef $undefined_string
turn many #if $undefined_string into #ifdef $undefined_string to fix some
warnings after -Wno-def was added to global CFLAGS
Signed-off-by: Olaf Hering <olh@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/um')
-rw-r--r-- | arch/um/drivers/cow.h | 4 | ||||
-rw-r--r-- | arch/um/kernel/skas/syscall_user.c | 4 | ||||
-rw-r--r-- | arch/um/os-Linux/elf_aux.c | 1 |
3 files changed, 5 insertions, 4 deletions
diff --git a/arch/um/drivers/cow.h b/arch/um/drivers/cow.h index 4fcbe8b1b77e..4fcf3a8d13f4 100644 --- a/arch/um/drivers/cow.h +++ b/arch/um/drivers/cow.h | |||
@@ -3,10 +3,10 @@ | |||
3 | 3 | ||
4 | #include <asm/types.h> | 4 | #include <asm/types.h> |
5 | 5 | ||
6 | #if __BYTE_ORDER == __BIG_ENDIAN | 6 | #if defined(__BIG_ENDIAN) |
7 | # define ntohll(x) (x) | 7 | # define ntohll(x) (x) |
8 | # define htonll(x) (x) | 8 | # define htonll(x) (x) |
9 | #elif __BYTE_ORDER == __LITTLE_ENDIAN | 9 | #elif defined(__LITTLE_ENDIAN) |
10 | # define ntohll(x) bswap_64(x) | 10 | # define ntohll(x) bswap_64(x) |
11 | # define htonll(x) bswap_64(x) | 11 | # define htonll(x) bswap_64(x) |
12 | #else | 12 | #else |
diff --git a/arch/um/kernel/skas/syscall_user.c b/arch/um/kernel/skas/syscall_user.c index 2828e6e37721..6b0664970147 100644 --- a/arch/um/kernel/skas/syscall_user.c +++ b/arch/um/kernel/skas/syscall_user.c | |||
@@ -15,7 +15,7 @@ | |||
15 | void handle_syscall(union uml_pt_regs *regs) | 15 | void handle_syscall(union uml_pt_regs *regs) |
16 | { | 16 | { |
17 | long result; | 17 | long result; |
18 | #if UML_CONFIG_SYSCALL_DEBUG | 18 | #ifdef UML_CONFIG_SYSCALL_DEBUG |
19 | int index; | 19 | int index; |
20 | 20 | ||
21 | index = record_syscall_start(UPT_SYSCALL_NR(regs)); | 21 | index = record_syscall_start(UPT_SYSCALL_NR(regs)); |
@@ -27,7 +27,7 @@ void handle_syscall(union uml_pt_regs *regs) | |||
27 | REGS_SET_SYSCALL_RETURN(regs->skas.regs, result); | 27 | REGS_SET_SYSCALL_RETURN(regs->skas.regs, result); |
28 | 28 | ||
29 | syscall_trace(regs, 1); | 29 | syscall_trace(regs, 1); |
30 | #if UML_CONFIG_SYSCALL_DEBUG | 30 | #ifdef UML_CONFIG_SYSCALL_DEBUG |
31 | record_syscall_end(index, result); | 31 | record_syscall_end(index, result); |
32 | #endif | 32 | #endif |
33 | } | 33 | } |
diff --git a/arch/um/os-Linux/elf_aux.c b/arch/um/os-Linux/elf_aux.c index f0d6060e3e57..5423b1ca17c4 100644 --- a/arch/um/os-Linux/elf_aux.c +++ b/arch/um/os-Linux/elf_aux.c | |||
@@ -11,6 +11,7 @@ | |||
11 | #include <stddef.h> | 11 | #include <stddef.h> |
12 | #include "init.h" | 12 | #include "init.h" |
13 | #include "elf_user.h" | 13 | #include "elf_user.h" |
14 | #include <asm/elf.h> | ||
14 | 15 | ||
15 | #if ELF_CLASS == ELFCLASS32 | 16 | #if ELF_CLASS == ELFCLASS32 |
16 | typedef Elf32_auxv_t elf_auxv_t; | 17 | typedef Elf32_auxv_t elf_auxv_t; |