Commit cb20c28a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'hostprogs-wmissing-prototypes' of... 

Merge branch 'hostprogs-wmissing-prototypes' of git://git.kernel.org/pub/scm/linux/kernel/git/josh/linux-misc

* 'hostprogs-wmissing-prototypes' of git://git.kernel.org/pub/scm/linux/kernel/git/josh/linux-misc:
  Makefile: Add -Wmising-prototypes to HOSTCFLAGS
  oss: Mark loadhex static in hex2hex.c
  dtc: Mark various internal functions static
  dtc: Set "noinput" in the lexer to avoid an unused function
  drm: radeon: Mark several functions static in mkregtable
  arch/sparc/boot/*.c: Mark various internal functions static
  arch/powerpc/boot/addRamDisk.c: Mark several internal functions static
  arch/alpha/boot/tools/objstrip.c: Mark "usage" static
  Documentation/vm/page-types.c: Declare checked_open static
  genksyms: Mark is_reserved_word static
  kconfig: Mark various internal functions static
  kconfig: Make zconf.y work with current bison
parents a08e37f3 25583d4b

Documentation/vm/page-types.c

+1 −1
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ static void fatal(const char *x, ...) 
	exit(EXIT_FAILURE);

}



int checked_open(const char *pathname, int flags)

static int checked_open(const char *pathname, int flags)

{

	int fd = open(pathname, flags);

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ 


HOSTCC       = gcc

HOSTCXX      = g++

HOSTCFLAGS   = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer

HOSTCFLAGS   = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer

HOSTCXXFLAGS = -O2



# Decide whether to build built-in, modular, or both.

arch/alpha/boot/tools/objstrip.c

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
const char * prog_name;





void

static void

usage (void)

{

    fprintf(stderr,

arch/powerpc/boot/addRamDisk.c

+3 −3
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ static int check_elf64(void *p, int size, struct addr_range *r) 


	return 64;

}

void get4k(FILE *file, char *buf )

static void get4k(FILE *file, char *buf )

{

	unsigned j;

	unsigned num = fread(buf, 1, 4096, file);
@@ -66,12 +66,12 @@ void get4k(FILE *file, char *buf ) 
		buf[j] = 0;

}



void put4k(FILE *file, char *buf )

static void put4k(FILE *file, char *buf )

{

	fwrite(buf, 1, 4096, file);

}



void death(const char *msg, FILE *fdesc, const char *fname) 

static void death(const char *msg, FILE *fdesc, const char *fname)

{

	fprintf(stderr, msg);

	fclose(fdesc);

arch/sparc/boot/btfixupprep.c

+4 −4
Original line number Diff line number Diff line
@@ -61,14 +61,14 @@ unsigned long lastfoffset = -1; 
unsigned long lastfrelno;

btfixup *lastf;



void fatal(void) __attribute__((noreturn));

void fatal(void)

static void fatal(void) __attribute__((noreturn));

static void fatal(void)

{

	fprintf(stderr, "Malformed output from objdump\n%s\n", buffer);

	exit(1);

}



btfixup *find(int type, char *name)

static btfixup *find(int type, char *name)

{

	int i;

	for (i = 0; i < last; i++) {
@@ -88,7 +88,7 @@ btfixup *find(int type, char *name) 
	return array + last - 1;

}



void set_mode (char *buffer)

static void set_mode (char *buffer)

{

  	for (mode = 0;; mode++)

		if (buffer[mode] < '0' || buffer[mode] > '9')

CRA Git | Maintained and supported by SUSTech CRA and CCSE