diff options
Diffstat (limited to 'miscutils')
-rw-r--r-- | miscutils/hdparm.c | 7 | ||||
-rw-r--r-- | miscutils/taskset.c | 6 |
2 files changed, 5 insertions, 8 deletions
diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c index 9c486e7aa..8e201ac35 100644 --- a/miscutils/hdparm.c +++ b/miscutils/hdparm.c | |||
@@ -368,9 +368,6 @@ struct globals { | |||
368 | #endif | 368 | #endif |
369 | } FIX_ALIASING; | 369 | } FIX_ALIASING; |
370 | #define G (*(struct globals*)&bb_common_bufsiz1) | 370 | #define G (*(struct globals*)&bb_common_bufsiz1) |
371 | struct BUG_G_too_big { | ||
372 | char BUG_G_too_big[sizeof(G) <= COMMON_BUFSIZE ? 1 : -1]; | ||
373 | }; | ||
374 | #define get_identity (G.get_identity ) | 371 | #define get_identity (G.get_identity ) |
375 | #define get_geom (G.get_geom ) | 372 | #define get_geom (G.get_geom ) |
376 | #define do_flush (G.do_flush ) | 373 | #define do_flush (G.do_flush ) |
@@ -433,7 +430,9 @@ struct BUG_G_too_big { | |||
433 | #define hwif_data (G.hwif_data ) | 430 | #define hwif_data (G.hwif_data ) |
434 | #define hwif_ctrl (G.hwif_ctrl ) | 431 | #define hwif_ctrl (G.hwif_ctrl ) |
435 | #define hwif_irq (G.hwif_irq ) | 432 | #define hwif_irq (G.hwif_irq ) |
436 | #define INIT_G() do { } while (0) | 433 | #define INIT_G() do { \ |
434 | BUILD_BUG_ON(sizeof(G) > COMMON_BUFSIZE); \ | ||
435 | } while (0) | ||
437 | 436 | ||
438 | 437 | ||
439 | /* Busybox messages and functions */ | 438 | /* Busybox messages and functions */ |
diff --git a/miscutils/taskset.c b/miscutils/taskset.c index 2646e1dab..100b1d926 100644 --- a/miscutils/taskset.c +++ b/miscutils/taskset.c | |||
@@ -75,12 +75,10 @@ static char *from_cpuset(cpu_set_t *mask) | |||
75 | #define TASKSET_PRINTF_MASK "%llx" | 75 | #define TASKSET_PRINTF_MASK "%llx" |
76 | static unsigned long long from_cpuset(cpu_set_t *mask) | 76 | static unsigned long long from_cpuset(cpu_set_t *mask) |
77 | { | 77 | { |
78 | struct BUG_CPU_SETSIZE_is_too_small { | ||
79 | char BUG_CPU_SETSIZE_is_too_small[ | ||
80 | CPU_SETSIZE < sizeof(int) ? -1 : 1]; | ||
81 | }; | ||
82 | char *p = (void*)mask; | 78 | char *p = (void*)mask; |
83 | 79 | ||
80 | BUILD_BUG_ON(CPU_SETSIZE < sizeof(int)); | ||
81 | |||
84 | /* Take the least significant bits. Careful! | 82 | /* Take the least significant bits. Careful! |
85 | * Consider both CPU_SETSIZE=4 and CPU_SETSIZE=1024 cases | 83 | * Consider both CPU_SETSIZE=4 and CPU_SETSIZE=1024 cases |
86 | */ | 84 | */ |