2.4.36-stable kernel tree
Revision | 0a1b1818b031b46e3755f12f5cff76df7a0661a8 (tree) |
---|---|
Zeit | 2007-08-05 04:45:54 |
Autor | Willy Tarreau <w@1wt....> |
Commiter | Willy Tarreau |
[PATCH] build fix for lvm with gcc 4
Reported by Marco Gatti :
I decided to upgrade from 2.4.34 to 2.4.35 in one of my servers but i
encountered a compile problem:
lvm.c:397: error: static declaration of 'vg_count' follows non-static
declaration
lvm-internal.h:48: error: previous declaration of 'vg_count' was here
I know this was an already fixed bug but now it seems to come out again
compiling 2.4.35 vanilla with gcc version 4.1.3 20070629 (prerelease) (Debian
4.1.2-13). 2.4.34.6 vanilla compiled fine.
Simple fix below tested and confirmed by Marco.
@@ -394,7 +394,7 @@ static char pv_name[NAME_LEN]; | ||
394 | 394 | /* static char rootvg[NAME_LEN] = { 0, }; */ |
395 | 395 | static int lock = 0; |
396 | 396 | static int _lock_open_count = 0; |
397 | -static uint vg_count = 0; | |
397 | +uint vg_count = 0; | |
398 | 398 | static long lvm_chr_open_count = 0; |
399 | 399 | static DECLARE_WAIT_QUEUE_HEAD(lvm_wait); |
400 | 400 |