Merge branch 'busybox' into merge

1 files changed, 3 insertions, 1 deletions

diff --git a/archival/cpio.c b/archival/cpio.c
index 30f66d1f7..d0cedd35c 100644
--- a/archival/cpio.c
+++ b/archival/cpio.c
@@ -11,6 +11,7 @@
  * Only supports new ASCII and CRC formats
  */
 #include "libbb.h"
+#include "common_bufsiz.h"
 #include "bb_archive.h"
 
 //config:config CPIO
@@ -170,9 +171,10 @@ enum {
 struct globals {
         struct bb_uidgid_t owner_ugid;
 } FIX_ALIASING;
-#define G (*(struct globals*)&bb_common_bufsiz1)
+#define G (*(struct globals*)bb_common_bufsiz1)
 void BUG_cpio_globals_too_big(void);
 #define INIT_G() do { \
+        setup_common_bufsiz(); \
         G.owner_ugid.uid = -1L; \
         G.owner_ugid.gid = -1L; \
 } while (0)