Commit e1c1ca3c authored by Cyrill Gorcunov's avatar Cyrill Gorcunov

util.h: Cleanup, no func changes

Just drop a couple of spaces and
add a comment.
Signed-off-by: 's avatarCyrill Gorcunov <gorcunov@openvz.org>
parent a722abce
...@@ -87,17 +87,21 @@ extern void printk(const char *format, ...); ...@@ -87,17 +87,21 @@ extern void printk(const char *format, ...);
} while (0) } while (0)
#ifndef BUG_ON_HANDLER #ifndef BUG_ON_HANDLER
#ifdef CR_NOGLIBC #ifdef CR_NOGLIBC
#define BUG_ON_HANDLER(condition) \ #define BUG_ON_HANDLER(condition) \
do { \ do { \
if ((condition)) { \ if ((condition)) { \
write_string("BUG at " __FILE__ ": "); \ write_string("BUG at " __FILE__ ": "); \
write_num(__LINE__); \ write_num(__LINE__); \
write_string("\n"); \ write_string("\n"); \
*(unsigned long *)NULL = 0xdead0000 + __LINE__; \ *(unsigned long *)NULL = 0xdead0000 + __LINE__; \
} \ } \
} while (0) } while (0)
#else
#else /* CR_NOGLIBC */
# define BUG_ON_HANDLER(condition) \ # define BUG_ON_HANDLER(condition) \
do { \ do { \
if ((condition)) { \ if ((condition)) { \
...@@ -105,8 +109,10 @@ extern void printk(const char *format, ...); ...@@ -105,8 +109,10 @@ extern void printk(const char *format, ...);
raise(SIGABRT); \ raise(SIGABRT); \
} \ } \
} while (0) } while (0)
#endif
#endif #endif /* CR_NOGLIBC */
#endif /* BUG_ON_HANDLER */
#define BUG_ON(condition) BUG_ON_HANDLER((condition)) #define BUG_ON(condition) BUG_ON_HANDLER((condition))
...@@ -135,9 +141,10 @@ extern void printk(const char *format, ...); ...@@ -135,9 +141,10 @@ extern void printk(const char *format, ...);
({ \ ({ \
size_t rc__ = read(fd, ptr, (size)); \ size_t rc__ = read(fd, ptr, (size)); \
if (rc__ && rc__ != (size)) { \ if (rc__ && rc__ != (size)) { \
pr_err("img corruption %d/%d\n", rc__, (size));\ pr_err("img corruption %d/%d\n", \
rc__, (size)); \
goto err; \ goto err; \
} \ } \
rc__; \ rc__; \
}) })
...@@ -154,14 +161,17 @@ struct list_head; ...@@ -154,14 +161,17 @@ struct list_head;
extern void printk_vma(struct vma_area *vma_area); extern void printk_vma(struct vma_area *vma_area);
#define pr_info_vma_list(head) \ #define pr_info_vma_list(head) \
do { \ do { \
struct vma_area *vma; \ struct vma_area *vma; \
list_for_each_entry(vma, head, list) \ list_for_each_entry(vma, head, list) \
pr_info_vma(vma); \ pr_info_vma(vma); \
} while (0) } while (0)
/* Note while VMA_AREA_NONE we rely on xzalloc */ /*
* Note since VMA_AREA_NONE = 0 we can skip assignment
* here and simply rely on xzalloc
*/
#define alloc_vma_area() \ #define alloc_vma_area() \
({ \ ({ \
struct vma_area *p__ = xzalloc(sizeof(*p__)); \ struct vma_area *p__ = xzalloc(sizeof(*p__)); \
......
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