diff options
| author | Sam Ravnborg <sam@mars.ravnborg.org> | 2005-03-12 10:49:12 +0100 |
|---|---|---|
| committer | Sam Ravnborg <sam@mars.ravnborg.org> | 2005-03-12 10:49:12 +0100 |
| commit | 0e6affc5a27c00c2f740f149b6b491e268d2396c (patch) | |
| tree | cdc44a8fb35336e6655c824da4c94948e41b3820 /scripts/mod | |
| parent | 12dd2ea4409a7b2829641b5af9ec14f68295d718 (diff) | |
| parent | d605b1d3fef0abb0c76798101859b26e04e3e51a (diff) | |
Merge mars.ravnborg.org:/home/sam/bk/linux-2.6
into mars.ravnborg.org:/home/sam/bk/kbuild
Diffstat (limited to 'scripts/mod')
| -rw-r--r-- | scripts/mod/modpost.c | 5 | ||||
| -rw-r--r-- | scripts/mod/modpost.h | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 347549c35d6c..9b9f94c915d2 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -47,11 +47,10 @@ warn(const char *fmt, ...) va_end(arglist); } -void *do_nofail(void *ptr, const char *file, int line, const char *expr) +void *do_nofail(void *ptr, const char *expr) { if (!ptr) { - fatal("Memory allocation failure %s line %d: %s.\n", - file, line, expr); + fatal("modpost: Memory allocation failure: %s.\n", expr); } return ptr; } diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h index eb8815ae209e..7334d839145d 100644 --- a/scripts/mod/modpost.h +++ b/scripts/mod/modpost.h @@ -53,8 +53,8 @@ static inline void __endian(const void *src, void *dest, unsigned int size) #endif -#define NOFAIL(ptr) do_nofail((ptr), __FILE__, __LINE__, #ptr) -void *do_nofail(void *ptr, const char *file, int line, const char *expr); +#define NOFAIL(ptr) do_nofail((ptr), #ptr) +void *do_nofail(void *ptr, const char *expr); struct buffer { char *p; |