Commit 10cc5d48 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'work.alpha' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull alpha updates from Al Viro:
 "FEN (floating-point enable) fault fix deals with a really old oopsable
  braino, the rest is alpha/boot compile fixes and minor cleaning up"

* 'work.alpha' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  alpha/boot/misc: trim unused declarations
  alpha/boot/tools/objstrip: fix the check for ELF header
  alpha/boot: fix the breakage from -isystem series...
  alpha: fix FEN fault handling
parents d6b9cf41 beb9797e

arch/alpha/boot/bootp.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -18,7 +18,7 @@ 
#include <asm/hwrpb.h>

#include <asm/hwrpb.h>

#include <asm/io.h>

#include <asm/io.h>





#include <stdarg.h>

#include <linux/stdarg.h>





#include "ksize.h"

#include "ksize.h"

arch/alpha/boot/bootpz.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include <asm/hwrpb.h>

#include <asm/hwrpb.h>

#include <asm/io.h>

#include <asm/io.h>





#include <stdarg.h>

#include <linux/stdarg.h>





#include "kzsize.h"

#include "kzsize.h"

arch/alpha/boot/main.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -15,7 +15,7 @@ 
#include <asm/console.h>

#include <asm/console.h>

#include <asm/hwrpb.h>

#include <asm/hwrpb.h>





#include <stdarg.h>

#include <linux/stdarg.h>





#include "ksize.h"

#include "ksize.h"

arch/alpha/boot/misc.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -89,8 +89,6 @@ static ulg output_ptr; 
static ulg bytes_out;

static ulg bytes_out;





static void error(char *m);

static void error(char *m);

static void gzip_mark(void **);

static void gzip_release(void **);





extern int end;

extern int end;

static ulg free_mem_ptr;

static ulg free_mem_ptr;

arch/alpha/boot/stdio.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -2,8 +2,8 @@ 
/*

/*

 * Copyright (C) Paul Mackerras 1997.

 * Copyright (C) Paul Mackerras 1997.

 */

 */

#include <stdarg.h>

#include <linux/string.h>

#include <stddef.h>

#include <linux/stdarg.h>





size_t strnlen(const char * s, size_t count)

size_t strnlen(const char * s, size_t count)

{

{