From 0bc9f9e63c0aa9c60ee309039d8f52708145ea4b Mon Sep 17 00:00:00 2001 From: "Robert P. J. Day" Date: Sun, 5 Jul 2009 09:46:19 -0400 Subject: kbuild: correct initramfs compression comment Fix the Makefile comment since bzip2 is now supported. Signed-off-by: Robert P. J. Day Signed-off-by: Sam Ravnborg --- usr/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'usr') diff --git a/usr/Makefile b/usr/Makefile index 245145a99c1..1e6a9e4a72c 100644 --- a/usr/Makefile +++ b/usr/Makefile @@ -6,7 +6,7 @@ klibcdirs:; PHONY += klibcdirs -# Gzip, but no bzip2 +# Gzip suffix_$(CONFIG_INITRAMFS_COMPRESSION_GZIP) = .gz # Bzip2 -- cgit v1.2.3-70-g09d2 From 78074cfc6e5054d736a2adb144c0e0dcc301c14a Mon Sep 17 00:00:00 2001 From: Jaswinder Singh Rajput Date: Fri, 18 Sep 2009 12:49:21 -0700 Subject: gitignore usr/initramfs_data.cpio.bz2 and usr/initramfs_data.cpio.lzma usr/initramfs_data.cpio.bz2 and usr/initramfs_data.cpio.lzma are binary files should be ignored Signed-off-by: Jaswinder Singh Rajput Signed-off-by: Andrew Morton Signed-off-by: Sam Ravnborg --- usr/.gitignore | 2 ++ 1 file changed, 2 insertions(+) (limited to 'usr') diff --git a/usr/.gitignore b/usr/.gitignore index 69b2e89fa16..8e48117a3f3 100644 --- a/usr/.gitignore +++ b/usr/.gitignore @@ -4,5 +4,7 @@ gen_init_cpio initramfs_data.cpio initramfs_data.cpio.gz +initramfs_data.cpio.bz2 +initramfs_data.cpio.lzma initramfs_list include -- cgit v1.2.3-70-g09d2 From 5c725138437837291db5c25f4a076ee852e806e3 Mon Sep 17 00:00:00 2001 From: Trevor Keith Date: Tue, 22 Sep 2009 16:43:38 -0700 Subject: Fix all -Wmissing-prototypes warnings in x86 defconfig Signed-off-by: Trevor Keith Cc: Sam Ravnborg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- scripts/conmakehash.c | 6 +++--- scripts/mod/modpost.c | 4 ++-- scripts/selinux/mdp/mdp.c | 4 ++-- usr/gen_init_cpio.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'usr') diff --git a/scripts/conmakehash.c b/scripts/conmakehash.c index e0c6891a9ad..263a44d57fa 100644 --- a/scripts/conmakehash.c +++ b/scripts/conmakehash.c @@ -24,14 +24,14 @@ typedef unsigned short unicode; -void usage(char *argv0) +static void usage(char *argv0) { fprintf(stderr, "Usage: \n" " %s chartable [hashsize] [hashstep] [maxhashlevel]\n", argv0); exit(EX_USAGE); } -int getunicode(char **p0) +static int getunicode(char **p0) { char *p = *p0; @@ -49,7 +49,7 @@ unicode unitable[MAX_FONTLEN][255]; /* Massive overkill, but who cares? */ int unicount[MAX_FONTLEN]; -void addpair(int fp, int un) +static void addpair(int fp, int un) { int i; diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 4522948a012..801a16a1754 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -691,7 +691,7 @@ static int number_prefix(const char *sym) * The $ syntax is for sections where ld append a dot number * to make section name unique. */ -int match(const char *sym, const char * const pat[]) +static int match(const char *sym, const char * const pat[]) { const char *p; while (*pat) { @@ -1746,7 +1746,7 @@ static void add_header(struct buffer *b, struct module *mod) buf_printf(b, "};\n"); } -void add_staging_flag(struct buffer *b, const char *name) +static void add_staging_flag(struct buffer *b, const char *name) { static const char *staging_dir = "drivers/staging"; diff --git a/scripts/selinux/mdp/mdp.c b/scripts/selinux/mdp/mdp.c index ca757d48618..b4ced856258 100644 --- a/scripts/selinux/mdp/mdp.c +++ b/scripts/selinux/mdp/mdp.c @@ -31,13 +31,13 @@ #include "flask.h" -void usage(char *name) +static void usage(char *name) { printf("usage: %s [-m] policy_file context_file\n", name); exit(1); } -void find_common_name(char *cname, char *dest, int len) +static void find_common_name(char *cname, char *dest, int len) { char *start, *end; diff --git a/usr/gen_init_cpio.c b/usr/gen_init_cpio.c index f1d3fe34176..83b3dde1a83 100644 --- a/usr/gen_init_cpio.c +++ b/usr/gen_init_cpio.c @@ -446,7 +446,7 @@ static int cpio_mkfile_line(const char *line) return rc; } -void usage(const char *prog) +static void usage(const char *prog) { fprintf(stderr, "Usage:\n" "\t%s \n" -- cgit v1.2.3-70-g09d2