diff --git a/[refs] b/[refs] index b4329bd7b8da..7a35894a0586 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ca5c8cde93d65db3139604ca6b91bf8ff3f775e2 +refs/heads/master: b0a5ab93158586e599ecd0d24a9a72da74d23ddd diff --git a/trunk/init/initramfs.c b/trunk/init/initramfs.c index 00eff7a11085..1db02a0025db 100644 --- a/trunk/init/initramfs.c +++ b/trunk/init/initramfs.c @@ -133,7 +133,7 @@ static __initdata loff_t this_header, next_header; static __initdata int dry_run; -static inline void eat(unsigned n) +static inline void __init eat(unsigned n) { victim += n; this_header += n;