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

Commit 8960f8c8 authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge
Browse files

Merge commit 'tip/x86/headers' into x86/untangle2 

* commit 'tip/x86/headers': (42 commits)
  x86: fix "__udivdi3" [drivers/scsi/aha1542.ko] undefined
  unconditionally include asm/types.h from linux/types.h
  make linux/types.h as assembly safe
  Neither asm/types.h nor linux/types.h is required for arch/ia64/include/asm/fpu.h
  headers_check fix cleanup: linux/reiserfs_fs.h
  headers_check fix cleanup: linux/nubus.h
  headers_check fix cleanup: linux/coda_psdev.h
  headers_check fix: x86, setup.h
  headers_check fix: x86, prctl.h
  headers_check fix: linux/reinserfs_fs.h
  headers_check fix: linux/socket.h
  headers_check fix: linux/nubus.h
  headers_check fix: linux/in6.h
  headers_check fix: linux/coda_psdev.h
  headers_check fix: xtensa, swab.h
  headers_check fix: powerpc, swab.h
  headers_check fix: powerpc, spu_info.h
  headers_check fix: powerpc, ps3fb.h
  headers_check fix: powerpc, kvm.h
  headers_check fix: powerpc, elf.h
  ...
parents 9b3651cb 22796b15

arch/alpha/include/asm/statfs.h

+2 −0
Original line number Diff line number Diff line 
#ifndef _ALPHA_STATFS_H

#define _ALPHA_STATFS_H



#include <linux/types.h>



/* Alpha is the only 64-bit platform with 32-bit statfs. And doesn't

   even seem to implement statfs64 */

#define __statfs_word __u32

arch/alpha/include/asm/swab.h

+1 −1
Original line number Diff line number Diff line 
#ifndef _ALPHA_SWAB_H

#define _ALPHA_SWAB_H



#include <asm/types.h>

#include <linux/types.h>

#include <linux/compiler.h>

#include <asm/compiler.h>

arch/arm/include/asm/a.out.h

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
#define __ARM_A_OUT_H__



#include <linux/personality.h>

#include <asm/types.h>

#include <linux/types.h>



struct exec

{

arch/arm/include/asm/setup.h

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#ifndef __ASMARM_SETUP_H

#define __ASMARM_SETUP_H



#include <asm/types.h>

#include <linux/types.h>



#define COMMAND_LINE_SIZE 1024

arch/arm/include/asm/swab.h

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#define __ASM_ARM_SWAB_H



#include <linux/compiler.h>

#include <asm/types.h>

#include <linux/types.h>



#if !defined(__STRICT_ANSI__) || defined(__KERNEL__)

#  define __SWAB_64_THRU_32__