Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45c82b5a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'header-fixes-for-linus' of... 

Merge branch 'header-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'header-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (90 commits)
  headers_check fix: x86, swab.h
  headers_check fix: x86, sigcontext32.h
  headers_check fix: x86, sigcontext.h
  headers_check fix: x86, ptrace-abi.h
  headers_check fix: x86, mtrr.h
  headers_check fix: x86, mce.h
  headers_check fix: x86, kvm.h
  headers_check fix: x86, e820.h
  headers_check fix: linux/rtnetlink.h
  headers_check fix: linux/nubus.h
  headers_check fix: video/uvesafb.h
  headers_check fix: video/sisfb.h
  headers_check fix: sound/hdsp.h
  headers_check fix: mtd/inftl-user.h
  headers_check fix: linux/virtio_net.h
  headers_check fix: linux/virtio_console.h
  headers_check fix: linux/virtio_blk.h
  headers_check fix: linux/videodev.h
  headers_check fix: linux/video_encoder.h
  headers_check fix: linux/video_decoder.h
  ...
parents 1347e965 7cff3608

arch/x86/include/asm/e820.h

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
#define E820_RESERVED_KERN        128



#ifndef __ASSEMBLY__

#include <linux/types.h>

struct e820entry {

	__u64 addr;	/* start of memory segment */

	__u64 size;	/* size of memory segment */

arch/x86/include/asm/kvm.h

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
 *

 */



#include <asm/types.h>

#include <linux/types.h>

#include <linux/ioctl.h>



/* Architectural interrupt line count. */

arch/x86/include/asm/mce.h

+1 −4
Original line number Diff line number Diff line
@@ -3,8 +3,8 @@ 


#ifdef __x86_64__



#include <linux/types.h>

#include <asm/ioctls.h>

#include <asm/types.h>



/*

 * Machine Check support for x86
@@ -115,8 +115,6 @@ extern int mce_notify_user(void); 


#endif /* !CONFIG_X86_32 */







#ifdef CONFIG_X86_MCE

extern void mcheck_init(struct cpuinfo_x86 *c);

#else
@@ -126,5 +124,4 @@ extern void stop_mce(void); 
extern void restart_mce(void);



#endif /* __KERNEL__ */



#endif /* _ASM_X86_MCE_H */

arch/x86/include/asm/mtrr.h

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#ifndef _ASM_X86_MTRR_H

#define _ASM_X86_MTRR_H



#include <linux/types.h>

#include <linux/ioctl.h>

#include <linux/errno.h>

arch/x86/include/asm/ptrace-abi.h

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ 
#ifdef CONFIG_X86_PTRACE_BTS



#ifndef __ASSEMBLY__

#include <asm/types.h>

#include <linux/types.h>



/* configuration/status structure used in PTRACE_BTS_CONFIG and

   PTRACE_BTS_STATUS commands.