diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-02-21 05:17:41 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-02-21 05:17:41 +0100 |
| commit | 153fcaa6c17124ebbf0d50df5da95f3564c7402b (patch) | |
| tree | 1bf422645d2285d06df43de299564937ed78254e | |
| parent | 7426920461738367205e3d08649c827c747bd93d (diff) | |
| download | busybox-w32-153fcaa6c17124ebbf0d50df5da95f3564c7402b.tar.gz busybox-w32-153fcaa6c17124ebbf0d50df5da95f3564c7402b.tar.bz2 busybox-w32-153fcaa6c17124ebbf0d50df5da95f3564c7402b.zip | |
Replace __uClinux__ define with !BB_MMU
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | procps/free.c | 6 | ||||
| -rw-r--r-- | shell/ash.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/procps/free.c b/procps/free.c index b13859103..e8bea5064 100644 --- a/procps/free.c +++ b/procps/free.c | |||
| @@ -27,7 +27,7 @@ int free_main(int argc UNUSED_PARAM, char **argv) | |||
| 27 | /* TODO: Make all this stuff not overflow when mem >= 4 Gib */ | 27 | /* TODO: Make all this stuff not overflow when mem >= 4 Gib */ |
| 28 | info.totalram/=info.mem_unit; | 28 | info.totalram/=info.mem_unit; |
| 29 | info.freeram/=info.mem_unit; | 29 | info.freeram/=info.mem_unit; |
| 30 | #ifndef __uClinux__ | 30 | #if BB_MMU |
| 31 | info.totalswap/=info.mem_unit; | 31 | info.totalswap/=info.mem_unit; |
| 32 | info.freeswap/=info.mem_unit; | 32 | info.freeswap/=info.mem_unit; |
| 33 | #endif | 33 | #endif |
| @@ -38,7 +38,7 @@ int free_main(int argc UNUSED_PARAM, char **argv) | |||
| 38 | /* TODO: Make all this stuff not overflow when mem >= 4 Gib */ | 38 | /* TODO: Make all this stuff not overflow when mem >= 4 Gib */ |
| 39 | info.totalram*=info.mem_unit; | 39 | info.totalram*=info.mem_unit; |
| 40 | info.freeram*=info.mem_unit; | 40 | info.freeram*=info.mem_unit; |
| 41 | #ifndef __uClinux__ | 41 | #if BB_MMU |
| 42 | info.totalswap*=info.mem_unit; | 42 | info.totalswap*=info.mem_unit; |
| 43 | info.freeswap*=info.mem_unit; | 43 | info.freeswap*=info.mem_unit; |
| 44 | #endif | 44 | #endif |
| @@ -56,7 +56,7 @@ int free_main(int argc UNUSED_PARAM, char **argv) | |||
| 56 | info.totalram-info.freeram, info.freeram, | 56 | info.totalram-info.freeram, info.freeram, |
| 57 | info.sharedram, info.bufferram); | 57 | info.sharedram, info.bufferram); |
| 58 | 58 | ||
| 59 | #ifndef __uClinux__ | 59 | #if BB_MMU |
| 60 | printf("%6s%13ld%13ld%13ld\n", "Swap:", info.totalswap, | 60 | printf("%6s%13ld%13ld%13ld\n", "Swap:", info.totalswap, |
| 61 | info.totalswap-info.freeswap, info.freeswap); | 61 | info.totalswap-info.freeswap, info.freeswap); |
| 62 | 62 | ||
diff --git a/shell/ash.c b/shell/ash.c index 7f14bedb5..03904bbf8 100644 --- a/shell/ash.c +++ b/shell/ash.c | |||
| @@ -73,7 +73,7 @@ | |||
| 73 | # define PIPE_BUF 4096 /* amount of buffering in a pipe */ | 73 | # define PIPE_BUF 4096 /* amount of buffering in a pipe */ |
| 74 | #endif | 74 | #endif |
| 75 | 75 | ||
| 76 | #if defined(__uClinux__) | 76 | #if !BB_MMU |
| 77 | # error "Do not even bother, ash will not run on NOMMU machine" | 77 | # error "Do not even bother, ash will not run on NOMMU machine" |
| 78 | #endif | 78 | #endif |
| 79 | 79 | ||
